eventespresso / event-espresso-core

caffeinated/brewing_regular.php

Indentation +314 added lines, -314 removed lines

@@ -27,322 +27,322 @@
 class EE_Brewing_Regular extends EE_BASE implements InterminableInterface
 {
 
-    /**
-     * @var TableAnalysis $table_analysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * EE_Brewing_Regular constructor.
-     *
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableAnalysis $table_analysis)
-    {
-        $this->_table_analysis = $table_analysis;
-        if (defined('EE_CAFF_PATH')) {
-            $this->setInitializationHooks();
-            $this->setApiRegistrationHooks();
-            $this->setSwitchHooks();
-            $this->setDefaultFilterHooks();
-            // caffeinated constructed
-            do_action('AHEE__EE_Brewing_Regular__construct__complete');
-        }
-    }
-
-
-    /**
-     * Various hooks used for extending features via registration of modules or extensions.
-     */
-    private function setApiRegistrationHooks()
-    {
-        add_filter(
-            'FHEE__EE_Config__register_modules__modules_to_register',
-            array($this, 'caffeinated_modules_to_register')
-        );
-        add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
-        add_filter(
-            'AHEE__EE_System__load_core_configuration__complete',
-            function () {
-                EE_Register_Payment_Method::register(
-                    'caffeinated_payment_methods',
-                    array(
-                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
-                    )
-                );
-            }
-        );
-    }
-
-
-    /**
-     * Various hooks used for modifying initialization or activation processes.
-     */
-    private function setInitializationHooks()
-    {
-        // activation
-        add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
-        // load caff init
-        add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
-        // load caff scripts
-        add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
-    }
-
-
-    /**
-     * Various hooks used for switch (on/off) type filters.
-     */
-    private function setSwitchHooks()
-    {
-        // remove the "powered by" credit link from receipts and invoices
-        add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
-        // seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
-        add_filter('FHEE__ee_show_affiliate_links', '__return_false');
-    }
-
-
-    /**
-     * Various filters for affecting default configuration values in the caffeinated
-     * context.
-     */
-    private function setDefaultFilterHooks()
-    {
-        add_filter(
-            'FHEE__EE_Admin_Config__show_reg_footer__default',
-            '__return_true'
-        );
-    }
-
-
-    /**
-     * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
-     *
-     * @param array $paths original helper paths array
-     * @return array             new array of paths
-     */
-    public function caf_helper_paths($paths)
-    {
-        $paths[] = EE_CAF_CORE . 'helpers' . DS;
-        return $paths;
-    }
-
-
-    /**
-     * Upon brand-new activation, if this is a new activation of CAF, we want to add
-     * some global prices that will show off EE4's capabilities. However, if they're upgrading
-     * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
-     * This action should only be called when EE 4.x.0.P is initially activated.
-     * Right now the only CAF content are these global prices. If there's more in the future, then
-     * we should probably create a caf file to contain it all instead just a function like this.
-     * Right now, we ASSUME the only price types in the system are default ones
-     *
-     * @global wpdb $wpdb
-     */
-    public function initialize_caf_db_content()
-    {
-        global $wpdb;
-        // use same method of getting creator id as the version introducing the change
-        $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        $price_table = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
-            $tax_price_type_count = $wpdb->get_var($SQL);
-            if ($tax_price_type_count <= 1) {
-                $wpdb->insert(
-                    $price_type_table,
-                    array(
-                        'PRT_name'       => __("Regional Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 60,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ),
-                    array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d', // PRT_wp_user
-                    )
-                );
-                // federal tax
-                $result = $wpdb->insert(
-                    $price_type_table,
-                    array(
-                        'PRT_name'       => __("Federal Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 70,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ),
-                    array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d' // PRT_wp_user
-                    )
-                );
-                if ($result) {
-                    $wpdb->insert(
-                        $price_table,
-                        array(
-                            'PRT_ID'         => $wpdb->insert_id,
-                            'PRC_amount'     => 15.00,
-                            'PRC_name'       => __("Sales Tax", "event_espresso"),
-                            'PRC_desc'       => '',
-                            'PRC_is_default' => true,
-                            'PRC_overrides'  => null,
-                            'PRC_deleted'    => false,
-                            'PRC_order'      => 50,
-                            'PRC_parent'     => null,
-                            'PRC_wp_user'    => $default_creator_id,
-                        ),
-                        array(
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
-                            '%d' // PRC_wp_user
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     *    caffeinated_modules_to_register
-     *
-     * @access public
-     * @param array $modules_to_register
-     * @return array
-     */
-    public function caffeinated_modules_to_register($modules_to_register = array())
-    {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR);
-            if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
-                $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
-            }
-        }
-        return $modules_to_register;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function caffeinated_init()
-    {
-        // Custom Post Type hooks
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            array($this, 'filter_taxonomies')
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            array($this, 'filter_cpts')
-        );
-        add_filter(
-            'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
-            array($this, 'nav_metabox_items')
-        );
-        EE_Registry::instance()->load_file(
-            EE_CAFF_PATH,
-            'EE_Caf_Messages',
-            'class',
-            array(),
-            false
-        );
-        // caffeinated_init__complete hook
-        do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
-    }
-
-
-    public function enqueue_caffeinated_scripts()
-    {
-        // sound of crickets...
-    }
-
-
-    /**
-     * callbacks below here
-     *
-     * @param array $taxonomy_array
-     * @return array
-     */
-    public function filter_taxonomies(array $taxonomy_array)
-    {
-        $taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
-        return $taxonomy_array;
-    }
-
-
-    /**
-     * @param array $cpt_array
-     * @return mixed
-     */
-    public function filter_cpts(array $cpt_array)
-    {
-        $cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
-        return $cpt_array;
-    }
-
-
-    /**
-     * @param array $menuitems
-     * @return array
-     */
-    public function nav_metabox_items(array $menuitems)
-    {
-        $menuitems[] = array(
-            'title'       => __('Venue List', 'event_espresso'),
-            'url'         => get_post_type_archive_link('espresso_venues'),
-            'description' => __('Archive page for all venues.', 'event_espresso'),
-        );
-        return $menuitems;
-    }
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws \EE_Error
-     */
-    protected function _get_table_analysis()
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        } else {
-            throw new \EE_Error(
-                sprintf(
-                    __('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                    get_class($this)
-                )
-            );
-        }
-    }
+	/**
+	 * @var TableAnalysis $table_analysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * EE_Brewing_Regular constructor.
+	 *
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableAnalysis $table_analysis)
+	{
+		$this->_table_analysis = $table_analysis;
+		if (defined('EE_CAFF_PATH')) {
+			$this->setInitializationHooks();
+			$this->setApiRegistrationHooks();
+			$this->setSwitchHooks();
+			$this->setDefaultFilterHooks();
+			// caffeinated constructed
+			do_action('AHEE__EE_Brewing_Regular__construct__complete');
+		}
+	}
+
+
+	/**
+	 * Various hooks used for extending features via registration of modules or extensions.
+	 */
+	private function setApiRegistrationHooks()
+	{
+		add_filter(
+			'FHEE__EE_Config__register_modules__modules_to_register',
+			array($this, 'caffeinated_modules_to_register')
+		);
+		add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
+		add_filter(
+			'AHEE__EE_System__load_core_configuration__complete',
+			function () {
+				EE_Register_Payment_Method::register(
+					'caffeinated_payment_methods',
+					array(
+						'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+					)
+				);
+			}
+		);
+	}
+
+
+	/**
+	 * Various hooks used for modifying initialization or activation processes.
+	 */
+	private function setInitializationHooks()
+	{
+		// activation
+		add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
+		// load caff init
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
+		// load caff scripts
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
+	}
+
+
+	/**
+	 * Various hooks used for switch (on/off) type filters.
+	 */
+	private function setSwitchHooks()
+	{
+		// remove the "powered by" credit link from receipts and invoices
+		add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
+		// seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
+		add_filter('FHEE__ee_show_affiliate_links', '__return_false');
+	}
+
+
+	/**
+	 * Various filters for affecting default configuration values in the caffeinated
+	 * context.
+	 */
+	private function setDefaultFilterHooks()
+	{
+		add_filter(
+			'FHEE__EE_Admin_Config__show_reg_footer__default',
+			'__return_true'
+		);
+	}
+
+
+	/**
+	 * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
+	 *
+	 * @param array $paths original helper paths array
+	 * @return array             new array of paths
+	 */
+	public function caf_helper_paths($paths)
+	{
+		$paths[] = EE_CAF_CORE . 'helpers' . DS;
+		return $paths;
+	}
+
+
+	/**
+	 * Upon brand-new activation, if this is a new activation of CAF, we want to add
+	 * some global prices that will show off EE4's capabilities. However, if they're upgrading
+	 * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
+	 * This action should only be called when EE 4.x.0.P is initially activated.
+	 * Right now the only CAF content are these global prices. If there's more in the future, then
+	 * we should probably create a caf file to contain it all instead just a function like this.
+	 * Right now, we ASSUME the only price types in the system are default ones
+	 *
+	 * @global wpdb $wpdb
+	 */
+	public function initialize_caf_db_content()
+	{
+		global $wpdb;
+		// use same method of getting creator id as the version introducing the change
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
+		$price_type_table = $wpdb->prefix . "esp_price_type";
+		$price_table = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
+			if ($tax_price_type_count <= 1) {
+				$wpdb->insert(
+					$price_type_table,
+					array(
+						'PRT_name'       => __("Regional Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 60,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					),
+					array(
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d', // PRT_wp_user
+					)
+				);
+				// federal tax
+				$result = $wpdb->insert(
+					$price_type_table,
+					array(
+						'PRT_name'       => __("Federal Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 70,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					),
+					array(
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d' // PRT_wp_user
+					)
+				);
+				if ($result) {
+					$wpdb->insert(
+						$price_table,
+						array(
+							'PRT_ID'         => $wpdb->insert_id,
+							'PRC_amount'     => 15.00,
+							'PRC_name'       => __("Sales Tax", "event_espresso"),
+							'PRC_desc'       => '',
+							'PRC_is_default' => true,
+							'PRC_overrides'  => null,
+							'PRC_deleted'    => false,
+							'PRC_order'      => 50,
+							'PRC_parent'     => null,
+							'PRC_wp_user'    => $default_creator_id,
+						),
+						array(
+							'%d',// PRT_id
+							'%f',// PRC_amount
+							'%s',// PRC_name
+							'%s',// PRC_desc
+							'%d',// PRC_is_default
+							'%d',// PRC_overrides
+							'%d',// PRC_deleted
+							'%d',// PRC_order
+							'%d',// PRC_parent
+							'%d' // PRC_wp_user
+						)
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 *    caffeinated_modules_to_register
+	 *
+	 * @access public
+	 * @param array $modules_to_register
+	 * @return array
+	 */
+	public function caffeinated_modules_to_register($modules_to_register = array())
+	{
+		if (is_readable(EE_CAFF_PATH . 'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
+			}
+		}
+		return $modules_to_register;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function caffeinated_init()
+	{
+		// Custom Post Type hooks
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			array($this, 'filter_taxonomies')
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			array($this, 'filter_cpts')
+		);
+		add_filter(
+			'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
+			array($this, 'nav_metabox_items')
+		);
+		EE_Registry::instance()->load_file(
+			EE_CAFF_PATH,
+			'EE_Caf_Messages',
+			'class',
+			array(),
+			false
+		);
+		// caffeinated_init__complete hook
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
+	}
+
+
+	public function enqueue_caffeinated_scripts()
+	{
+		// sound of crickets...
+	}
+
+
+	/**
+	 * callbacks below here
+	 *
+	 * @param array $taxonomy_array
+	 * @return array
+	 */
+	public function filter_taxonomies(array $taxonomy_array)
+	{
+		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
+		return $taxonomy_array;
+	}
+
+
+	/**
+	 * @param array $cpt_array
+	 * @return mixed
+	 */
+	public function filter_cpts(array $cpt_array)
+	{
+		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
+		return $cpt_array;
+	}
+
+
+	/**
+	 * @param array $menuitems
+	 * @return array
+	 */
+	public function nav_metabox_items(array $menuitems)
+	{
+		$menuitems[] = array(
+			'title'       => __('Venue List', 'event_espresso'),
+			'url'         => get_post_type_archive_link('espresso_venues'),
+			'description' => __('Archive page for all venues.', 'event_espresso'),
+		);
+		return $menuitems;
+	}
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws \EE_Error
+	 */
+	protected function _get_table_analysis()
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		} else {
+			throw new \EE_Error(
+				sprintf(
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+					get_class($this)
+				)
+			);
+		}
+	}
 }
 
 
 $brewing = new EE_Brewing_Regular(
-    EE_Registry::instance()->create('TableAnalysis', array(), true)
+	EE_Registry::instance()->create('TableAnalysis', array(), true)
 );

Spacing +31 added lines, -31 removed lines

@@ -11,10 +11,10 @@ 
  * define and use the hook in a specific caffeinated/whatever class or file.
  */
 // defined some new constants related to caffeinated folder
-define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/');
-define('EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS);
-define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries' . DS);
-define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods' . DS);
+define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+define('EE_CAF_CORE', EE_CAFF_PATH.'core'.DS);
+define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries'.DS);
+define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods'.DS);
 
 
 /**
@@ -64,11 +64,11 @@ 
         add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
         add_filter(
             'AHEE__EE_System__load_core_configuration__complete',
-            function () {
+            function() {
                 EE_Register_Payment_Method::register(
                     'caffeinated_payment_methods',
                     array(
-                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR),
                     )
                 );
             }
@@ -123,7 +123,7 @@ 
      */
     public function caf_helper_paths($paths)
     {
-        $paths[] = EE_CAF_CORE . 'helpers' . DS;
+        $paths[] = EE_CAF_CORE.'helpers'.DS;
         return $paths;
     }
 
@@ -144,10 +144,10 @@ 
         global $wpdb;
         // use same method of getting creator id as the version introducing the change
         $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_type_table = $wpdb->prefix."esp_price_type";
+        $price_table = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+            $SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; // include trashed price types
             $tax_price_type_count = $wpdb->get_var($SQL);
             if ($tax_price_type_count <= 1) {
                 $wpdb->insert(
@@ -161,11 +161,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ),
                     array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d', // PRT_wp_user
                     )
                 );
@@ -181,11 +181,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ),
                     array(
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d' // PRT_wp_user
                     )
                 );
@@ -205,15 +205,15 @@ 
                             'PRC_wp_user'    => $default_creator_id,
                         ),
                         array(
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
+                            '%d', // PRT_id
+                            '%f', // PRC_amount
+                            '%s', // PRC_name
+                            '%s', // PRC_desc
+                            '%d', // PRC_is_default
+                            '%d', // PRC_overrides
+                            '%d', // PRC_deleted
+                            '%d', // PRC_order
+                            '%d', // PRC_parent
                             '%d' // PRC_wp_user
                         )
                     );
@@ -232,8 +232,8 @@ 
      */
     public function caffeinated_modules_to_register($modules_to_register = array())
     {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR);
+        if (is_readable(EE_CAFF_PATH.'modules')) {
+            $caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules'.DS.'*', GLOB_ONLYDIR);
             if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
                 $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
             }

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

Indentation +191 added lines, -191 removed lines

@@ -14,68 +14,68 @@ 
 class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage
 {
 
-    private $_converted_active_gateways = false;
+	private $_converted_active_gateways = false;
 
-    public function _migration_step($num_items = 50)
-    {
-        // loads existing EE_CONfig from DB, if it exists
-        $new_gateway_config_obj = EE_Config::instance()->gateway;
-        $items_actually_migrated = 0;
-        // convert settings
-        $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
-        // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
-        foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
-            $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                // determine the old option's name
-                $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
-                    // no settings existed for this gateway anyways... weird...
-                    $items_actually_migrated++;
-                    continue;
-                }
-                // now prepare the settings to make sure they're in the 4.1 format
-                $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
-                // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
-                // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
-                delete_option($old_gateway_wp_option_name);
-            } else {// it must be one of the ones we mostly leave alone
-                global $wpdb;
-                // yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
-                // only be saving users 50 milliseconds the one time this runs...
-                $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
-            }
+	public function _migration_step($num_items = 50)
+	{
+		// loads existing EE_CONfig from DB, if it exists
+		$new_gateway_config_obj = EE_Config::instance()->gateway;
+		$items_actually_migrated = 0;
+		// convert settings
+		$gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
+		// just do a part of them on this request
+		$gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
+			$old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+			if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				// determine the old option's name
+				$old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
+				if (! $old_gateway_settings) {
+					// no settings existed for this gateway anyways... weird...
+					$items_actually_migrated++;
+					continue;
+				}
+				// now prepare the settings to make sure they're in the 4.1 format
+				$new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
+				$new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+				// and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
+				// I think it's ok to do right away this time (we wont need gateway settings elsewhere)
+				delete_option($old_gateway_wp_option_name);
+			} else {// it must be one of the ones we mostly leave alone
+				global $wpdb;
+				// yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
+				// only be saving users 50 milliseconds the one time this runs...
+				$wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
+			}
         
-            $items_actually_migrated++;
-        }
-        // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
-            $this->_convert_active_gateways();
-            $this->_converted_active_gateways = true;
-            $items_actually_migrated++;
-        }
+			$items_actually_migrated++;
+		}
+		// if we can keep going, and it hasn' tbeen done yet, convert active gateways
+		if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+			$this->_convert_active_gateways();
+			$this->_converted_active_gateways = true;
+			$items_actually_migrated++;
+		}
     
-        EE_Config::instance()->update_espresso_config(false, false);
-        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()
-    {
-        $count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
-        $step_of_setting_active_gateways = 1;
-        $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
-    //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = __("Gateways", "event_espresso");
-        parent::__construct();
-    }
+		EE_Config::instance()->update_espresso_config(false, false);
+		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()
+	{
+		$count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
+		$step_of_setting_active_gateways = 1;
+		$count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
+	//  $button_images_to_update =
+		return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = __("Gateways", "event_espresso");
+		parent::__construct();
+	}
 
 /**
  * Takes the old array of 3.1 gateway settings for this gateway and converts it
@@ -85,148 +85,148 @@ 
  * @param string $new_gateway_slug
  * @return array
  */
-    private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
-    {
-        $new_gateway_settings = $old_gateway_settings;
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
-                $new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
-                break;
-            case 'Invoice':
-                $new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
-                // Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
-                // it gets used in the receipts which are available to everyone. So usually it's best to not
-                // migrate this.
-                unset($new_gateway_settings['payment_address']);
-                break;
-            case 'Paypal_Pro':
-                $new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
-                $new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
-                $new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
-                $new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
-                $new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
-                $new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
-                break;
-        }
-        return $new_gateway_settings;
-    }
+	private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
+	{
+		$new_gateway_settings = $old_gateway_settings;
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
+				$new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
+				break;
+			case 'Invoice':
+				$new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
+				// Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
+				// it gets used in the receipts which are available to everyone. So usually it's best to not
+				// migrate this.
+				unset($new_gateway_settings['payment_address']);
+				break;
+			case 'Paypal_Pro':
+				$new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
+				$new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
+				$new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
+				$new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
+				$new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
+				$new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
+				break;
+		}
+		return $new_gateway_settings;
+	}
 /**
- * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
- * @param string $new_gateway_slug
- * @return string
- */
-    private function _get_old_gateway_option($new_gateway_slug)
-    {
-        $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
-    //  if( ! $settings){
-    //      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
-    //  }
-        return $settings;
-    }
+	 * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
+	 * @param string $new_gateway_slug
+	 * @return string
+	 */
+	private function _get_old_gateway_option($new_gateway_slug)
+	{
+		$option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+		$settings =  get_option($option_name, null);
+	//  if( ! $settings){
+	//      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
+	//  }
+		return $settings;
+	}
 
 /**
  * Just gets the old gateways slug
  * @param string $new_gateway_slug
  * @return string
  */
-    private function _get_old_gateway_option_name($new_gateway_slug)
-    {
-        $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
-        $normal_option_prefix = 'event_espresso_';
-        $normal_option_postfix = '_settings';
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
-                break;
-            case 'Aim':
-                $option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
-                break;
-            case 'Check':
-                $option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
-                break;
-            case 'Ideal':
-                $option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
-                break;
-            case 'Invoice':
-                $option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
-                break;
-            case 'Purchase_Order':
-                $option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
-                break;
-            case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
-                break;
-            case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
-                break;
-            default:
-                $option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
-        }
-        return $option_name;
-    }
+	private function _get_old_gateway_option_name($new_gateway_slug)
+	{
+		$new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
+		$old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+		$normal_option_prefix = 'event_espresso_';
+		$normal_option_postfix = '_settings';
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
+				break;
+			case 'Aim':
+				$option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
+				break;
+			case 'Check':
+				$option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
+				break;
+			case 'Ideal':
+				$option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
+				break;
+			case 'Invoice':
+				$option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
+				break;
+			case 'Purchase_Order':
+				$option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
+				break;
+			case 'USAePay_Offsite':
+				$option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
+				break;
+			case 'USAePay_Onsite':
+				$option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
+				break;
+			default:
+				$option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
+		}
+		return $option_name;
+	}
 
-    private function _convert_active_gateways()
-    {
-        // just does it all one big swoop
-        $old_active_gateways = get_option('event_espresso_active_gateways');
-        $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
-        foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                $this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
-                continue;
-            }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+	private function _convert_active_gateways()
+	{
+		// just does it all one big swoop
+		$old_active_gateways = get_option('event_espresso_active_gateways');
+		$new_active_gateways = EE_Config::instance()->gateway->active_gateways;
+		foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
+			if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				$this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
+				continue;
+			}
+			$new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
         
-            // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
-        }
-        EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
-    }
+			// in the new format we can also upload gateways to the uploads directory and
+			$new_active_gateways[ $new_gateway_slug ] = false;
+		}
+		EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
+	}
     
-    protected $_gateways_we_know_how_to_migrate = array(
-        'aim'=>'Aim',
-        'bank'=>'Bank',
-        'check'=>'Check',
-        'invoice'=>'Invoice',
-        'paypal'=>'Paypal_Standard',
-        'paypal_pro'=>'Paypal_Pro',
+	protected $_gateways_we_know_how_to_migrate = array(
+		'aim'=>'Aim',
+		'bank'=>'Bank',
+		'check'=>'Check',
+		'invoice'=>'Invoice',
+		'paypal'=>'Paypal_Standard',
+		'paypal_pro'=>'Paypal_Pro',
 
-    );
+	);
     
-    protected $_gateways_we_leave_alone = array(
-        '2checkout'=>'2checkout',
-        'anz'=>'Anz',
-        'atos'=>'Atos',
-        'authnet'=>'Authnet',
-        'beanstream'=>'Beanstream',
-        'evertec'=>'Evertec',
-        'eway'=>'Eway',
-        'eway_rapid3'=>'Eway_Rapid3',
-        'exact'=>'Exact',
-        'firstdata'=>'Firstdata',
-        'firstdat_e4'=>'Firstdata_E4',
-        'ideal'=>'Ideal',
-        'infusion_payment'=>'InfusionSoft',
-        'luottokunta'=>'Luottokunta',
-        'megasoft'=>'Megasoft',
-        'moneris_hpp'=>'Moneris_HPP',
-        'mwarrior'=>'Mwarrior',
-        'nab'=>'NAB',
-        'paychoice'=>'Paychoice',
-        'paytrace'=>'Paytrace',
-        'psigate'=>'Psigate',
-        'purchase_order'=>'Purchase_Order',
-        'qbms'=>'QBMS',
-        'quickpay'=>'Quickpay',
-        'realauth'=>'Realauth',
-        'securepay_aus'=>'Securepay_Aus',
-        'stripe'=>'Stripe',
-        'usaepay_offsite'=>'USAePay_Offsite',
-        'usaepay_onsite'=>'USAePay_Onsite',
-        'wepay'=>'Wepay',
-        'worldpay'=>'Worldpay'
-    );
+	protected $_gateways_we_leave_alone = array(
+		'2checkout'=>'2checkout',
+		'anz'=>'Anz',
+		'atos'=>'Atos',
+		'authnet'=>'Authnet',
+		'beanstream'=>'Beanstream',
+		'evertec'=>'Evertec',
+		'eway'=>'Eway',
+		'eway_rapid3'=>'Eway_Rapid3',
+		'exact'=>'Exact',
+		'firstdata'=>'Firstdata',
+		'firstdat_e4'=>'Firstdata_E4',
+		'ideal'=>'Ideal',
+		'infusion_payment'=>'InfusionSoft',
+		'luottokunta'=>'Luottokunta',
+		'megasoft'=>'Megasoft',
+		'moneris_hpp'=>'Moneris_HPP',
+		'mwarrior'=>'Mwarrior',
+		'nab'=>'NAB',
+		'paychoice'=>'Paychoice',
+		'paytrace'=>'Paytrace',
+		'psigate'=>'Psigate',
+		'purchase_order'=>'Purchase_Order',
+		'qbms'=>'QBMS',
+		'quickpay'=>'Quickpay',
+		'realauth'=>'Realauth',
+		'securepay_aus'=>'Securepay_Aus',
+		'stripe'=>'Stripe',
+		'usaepay_offsite'=>'USAePay_Offsite',
+		'usaepay_onsite'=>'USAePay_Onsite',
+		'wepay'=>'Wepay',
+		'worldpay'=>'Worldpay'
+	);
 }

core/espresso_definitions.php

Indentation +11 added lines, -11 removed lines

@@ -7,16 +7,16 @@ 
 define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 // used to be DIRECTORY_SEPARATOR, but that caused issues on windows
 if (! defined('DS')) {
-    define('DS', '/');
+	define('DS', '/');
 }
 if (! defined('PS')) {
-    define('PS', PATH_SEPARATOR);
+	define('PS', PATH_SEPARATOR);
 }
 if (! defined('SP')) {
-    define('SP', ' ');
+	define('SP', ' ');
 }
 if (! defined('EENL')) {
-    define('EENL', "\n");
+	define('EENL', "\n");
 }
 // define the plugin directory and URL
 define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
@@ -70,16 +70,16 @@ 
 define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
 // check for DOMPDF fonts in uploads
 if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
-    define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
+	define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
 }
 // ajax constants
 define(
-    'EE_FRONT_AJAX',
-    isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax'])
+	'EE_FRONT_AJAX',
+	isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax'])
 );
 define(
-    'EE_ADMIN_AJAX',
-    isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax'])
+	'EE_ADMIN_AJAX',
+	isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax'])
 );
 // just a handy constant occasionally needed for finding values representing infinity in the DB
 // you're better to use this than its straight value (currently -1) in case you ever
@@ -87,9 +87,9 @@ 
 define('EE_INF_IN_DB', -1);
 define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
 if (! defined('EE_DEBUG')) {
-    define('EE_DEBUG', false);
+	define('EE_DEBUG', false);
 }
 // for older WP versions
 if (! defined('MONTH_IN_SECONDS')) {
-    define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
+	define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
 }

Spacing +45 added lines, -45 removed lines

@@ -6,71 +6,71 @@ 
 define('EE_MIN_PHP_VER_RECOMMENDED', '5.6.32');
 define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 // used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-if (! defined('DS')) {
+if ( ! defined('DS')) {
     define('DS', '/');
 }
-if (! defined('PS')) {
+if ( ! defined('PS')) {
     define('PS', PATH_SEPARATOR);
 }
-if (! defined('SP')) {
+if ( ! defined('SP')) {
     define('SP', ' ');
 }
-if (! defined('EENL')) {
+if ( ! defined('EENL')) {
     define('EENL', "\n");
 }
 // define the plugin directory and URL
 define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
-define('EE_PLUGIN_DIR_PATH', dirname(EVENT_ESPRESSO_MAIN_FILE) . DS);
+define('EE_PLUGIN_DIR_PATH', dirname(EVENT_ESPRESSO_MAIN_FILE).DS);
 define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 // main root folder paths
-define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS);
-define('EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS);
-define('EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS);
-define('EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS);
-define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS);
-define('EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS);
-define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
-define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS);
+define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 // core system paths
-define('EE_ADMIN', EE_CORE . 'admin' . DS);
-define('EE_CPTS', EE_CORE . 'CPTs' . DS);
-define('EE_CLASSES', EE_CORE . 'db_classes' . DS);
-define('EE_INTERFACES', EE_CORE . 'interfaces' . DS);
-define('EE_BUSINESS', EE_CORE . 'business' . DS);
-define('EE_MODELS', EE_CORE . 'db_models' . DS);
-define('EE_HELPERS', EE_CORE . 'helpers' . DS);
-define('EE_LIBRARIES', EE_CORE . 'libraries' . DS);
-define('EE_TEMPLATES', EE_CORE . 'templates' . DS);
-define('EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS);
-define('EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS);
-define('EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS);
+define('EE_ADMIN', EE_CORE.'admin'.DS);
+define('EE_CPTS', EE_CORE.'CPTs'.DS);
+define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+define('EE_INTERFACES', EE_CORE.'interfaces'.DS);
+define('EE_BUSINESS', EE_CORE.'business'.DS);
+define('EE_MODELS', EE_CORE.'db_models'.DS);
+define('EE_HELPERS', EE_CORE.'helpers'.DS);
+define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 // gateways
-define('EE_GATEWAYS', EE_MODULES . 'gateways' . DS);
-define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS);
+define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 // asset URL paths
-define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS);
-define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS);
-define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS);
-define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS);
-define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/');
-define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
+define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 // define upload paths
 $uploads = wp_upload_dir();
 // define the uploads directory and URL
-define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS);
-define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS);
+define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 // define the templates directory and URL
-define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS);
-define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS);
+define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 // define the gateway directory and URL
-define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS);
-define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS);
+define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 // languages folder/path
-define('EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS);
-define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS);
+define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 // check for DOMPDF fonts in uploads
-if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS)) {
-    define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS);
+if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+    define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 }
 // ajax constants
 define(
@@ -86,10 +86,10 @@ 
 // want to change its default value! or find when -1 means infinity
 define('EE_INF_IN_DB', -1);
 define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
-if (! defined('EE_DEBUG')) {
+if ( ! defined('EE_DEBUG')) {
     define('EE_DEBUG', false);
 }
 // for older WP versions
-if (! defined('MONTH_IN_SECONDS')) {
+if ( ! defined('MONTH_IN_SECONDS')) {
     define('MONTH_IN_SECONDS', DAY_IN_SECONDS * 30);
 }

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_invoice_settings.dmsstage.php

Spacing +4 added lines, -4 removed lines

@@ -52,11 +52,11 @@ 
     protected function _migration_step($num_items = 1)
     {
         // if this isn't set then something is really wrong
-        if (! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+        if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
             throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
         }
         $invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : null;
-        if (! $invoice_settings) {
+        if ( ! $invoice_settings) {
             $this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
         } else {
             $invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
@@ -89,8 +89,8 @@ 
                 );
             }
             $templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-            $overridden_invoice_body = EEH_Template::locate_template($templates_relative_path . 'invoice_body.template.php', null, false, false, true);
-            $overridden_receipt_body= EEH_Template::locate_template($templates_relative_path . 'receipt_body.template.php', null, false, false, true);
+            $overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', null, false, false, true);
+            $overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', null, false, false, true);
             if ($overridden_invoice_body || $overridden_receipt_body) {
                 new PersistentAdminNotice(
                     'invoice_overriding_templates',

Indentation +84 added lines, -84 removed lines

@@ -15,95 +15,95 @@
 class EE_DMS_4_5_0_invoice_settings extends EE_Data_Migration_Script_Stage
 {
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        $this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
+		parent::__construct();
+	}
 
 
 
-    /**
-     * _count_records_to_migrate
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @access protected
-     * @return int
-     */
-    protected function _count_records_to_migrate()
-    {
-        return 1;
-    }
+	/**
+	 * _count_records_to_migrate
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @access protected
+	 * @return int
+	 */
+	protected function _count_records_to_migrate()
+	{
+		return 1;
+	}
 
 
 
-    /**
-     *    _migration_step
-     *
-     * @access protected
-     * @param int $num_items
-     * @throws EE_Error
-     * @return int number of items ACTUALLY migrated
-     * @throws InvalidDataTypeException
-     */
-    protected function _migration_step($num_items = 1)
-    {
-        // if this isn't set then something is really wrong
-        if (! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
-            throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
-        }
-        $invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : null;
-        if (! $invoice_settings) {
-            $this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
-        } else {
-            $invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
-            $invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
-            $invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
-            $invoice_settings['template_invoice_email'] = '';
-            $invoice_settings['template_invoice_tax_number'] = '';
-            unset($invoice_settings['pdf_instructions']);
-            unset($invoice_settings['payable_to']);
-            unset($invoice_settings['payment_address']);
-            EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
-            EE_Config::instance()->update_espresso_config(false, false);
+	/**
+	 *    _migration_step
+	 *
+	 * @access protected
+	 * @param int $num_items
+	 * @throws EE_Error
+	 * @return int number of items ACTUALLY migrated
+	 * @throws InvalidDataTypeException
+	 */
+	protected function _migration_step($num_items = 1)
+	{
+		// if this isn't set then something is really wrong
+		if (! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
+		}
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : null;
+		if (! $invoice_settings) {
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email'] = '';
+			$invoice_settings['template_invoice_tax_number'] = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
-            // @todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
-            // (why is it tough to change? because we want to update the receipt and invoice message template, but
-            // message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
-            // update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
-            // also we don't want to build a dependency on the messages code because it is likely to change soon
-            if (isset($invoice_settings['invoice_css'])
-                && ! in_array($invoice_settings['invoice_css'], ['', 'simple.css'])) {
-                new PersistentAdminNotice(
-                    'invoice_css_not_updated',
-                    sprintf(
-                        esc_html__(
-                            'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
-                            'event_espresso'
-                        ),
-                        $invoice_settings['invoice_css']
-                    )
-                );
-            }
-            $templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-            $overridden_invoice_body = EEH_Template::locate_template($templates_relative_path . 'invoice_body.template.php', null, false, false, true);
-            $overridden_receipt_body= EEH_Template::locate_template($templates_relative_path . 'receipt_body.template.php', null, false, false, true);
-            if ($overridden_invoice_body || $overridden_receipt_body) {
-                new PersistentAdminNotice(
-                    'invoice_overriding_templates',
-                    esc_html__(
-                        'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
-                        'event_espresso'
-                    ),
-                    true
-                );
-            }
-        }
-        // regardless of whether it worked or not, we ought to continue the migration
-        $this->set_completed();
-        return 1;
-    }
+			// @todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
+			// (why is it tough to change? because we want to update the receipt and invoice message template, but
+			// message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
+			// update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
+			// also we don't want to build a dependency on the messages code because it is likely to change soon
+			if (isset($invoice_settings['invoice_css'])
+				&& ! in_array($invoice_settings['invoice_css'], ['', 'simple.css'])) {
+				new PersistentAdminNotice(
+					'invoice_css_not_updated',
+					sprintf(
+						esc_html__(
+							'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
+							'event_espresso'
+						),
+						$invoice_settings['invoice_css']
+					)
+				);
+			}
+			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path . 'invoice_body.template.php', null, false, false, true);
+			$overridden_receipt_body= EEH_Template::locate_template($templates_relative_path . 'receipt_body.template.php', null, false, false, true);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
+				new PersistentAdminNotice(
+					'invoice_overriding_templates',
+					esc_html__(
+						'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
+						'event_espresso'
+					),
+					true
+				);
+			}
+		}
+		// regardless of whether it worked or not, we ought to continue the migration
+		$this->set_completed();
+		return 1;
+	}
 }

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

Indentation +292 added lines, -292 removed lines

@@ -87,57 +87,57 @@ 
  */
 class EE_DMS_4_1_0_prices extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_price_table;
-    private $_new_ticket_table;
-    private $_new_ticket_price_table;
-    private $_new_datetime_ticket_table;
-    /**
-     * A count of all the different tickets created, used for setting the new ones' TKT_Order
-     * @var int
-     */
-    private $_ticket_count = 0;
-    const price_type_base = 1;
-    const price_type_member_discount = 3;
-    const price_type_percent_surcharge = 4;
-    const price_type_flat_surcharge = 5;
+	private $_new_price_table;
+	private $_new_ticket_table;
+	private $_new_ticket_price_table;
+	private $_new_datetime_ticket_table;
+	/**
+	 * A count of all the different tickets created, used for setting the new ones' TKT_Order
+	 * @var int
+	 */
+	private $_ticket_count = 0;
+	const price_type_base = 1;
+	const price_type_member_discount = 3;
+	const price_type_percent_surcharge = 4;
+	const price_type_flat_surcharge = 5;
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Prices", "event_espresso");
-        $this->_old_table = $wpdb->prefix."events_prices";
-        $this->select_expression = 'p.*, e.event_status';
-        $this->_extra_where_sql = ' AS p 
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Prices", "event_espresso");
+		$this->_old_table = $wpdb->prefix."events_prices";
+		$this->select_expression = 'p.*, e.event_status';
+		$this->_extra_where_sql = ' AS p 
             INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON p.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_new_price_table = $wpdb->prefix."esp_price";
-        $this->_new_ticket_table = $wpdb->prefix."esp_ticket";
-        $this->_new_ticket_price_table = $wpdb->prefix."esp_ticket_price";
-        $this->_new_datetime_ticket_table = $wpdb->prefix."esp_datetime_ticket";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // create the base price
-        $new_price_id = $this->_insert_new_price($old_row);
-        // create the member discount if there is any
-        // commented-out because we may actually NOT be supporting this in 4.1
+		$this->_new_price_table = $wpdb->prefix."esp_price";
+		$this->_new_ticket_table = $wpdb->prefix."esp_ticket";
+		$this->_new_ticket_price_table = $wpdb->prefix."esp_ticket_price";
+		$this->_new_datetime_ticket_table = $wpdb->prefix."esp_datetime_ticket";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// create the base price
+		$new_price_id = $this->_insert_new_price($old_row);
+		// create the member discount if there is any
+		// commented-out because we may actually NOT be supporting this in 4.1
 //      if($old_row['event_cost'] != $old_row['member_price']){
 //          $member_price_discount_id = $this->_insert_new_member_price($old_row);
 //      }else{
 //          $member_price_discount_id = 0;
 //      }
-        // create the surcharge if there is any
-        if (floatval($old_row['surcharge']) >= 0.01) {
-            $surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
-        } else {
-            $surcharge_price_id = 0;
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
-        }
-        // associate the ticket to all datetimes for event (ie, this ONE ticket grants access to ALL datetimes, not just one of the attendee's choice.
-        // if the latter were the case, then we'd create a separate ticket for each datetime and ahve their association be one-to-one)
-        // create ticket
+		// create the surcharge if there is any
+		if (floatval($old_row['surcharge']) >= 0.01) {
+			$surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
+		} else {
+			$surcharge_price_id = 0;
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
+		}
+		// associate the ticket to all datetimes for event (ie, this ONE ticket grants access to ALL datetimes, not just one of the attendee's choice.
+		// if the latter were the case, then we'd create a separate ticket for each datetime and ahve their association be one-to-one)
+		// create ticket
 //      $ticket_id = $this->_insert_new_ticket($old_row);
 //      if($ticket_id){
 //          $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_ticket_table, $ticket_id);
@@ -149,62 +149,62 @@ 
 //              $this->_insert_datetime_ticket_relation($new_datetime_id, $ticket_id);
 //          }
 //      }
-        // create a ticket for each old price -old datetime combo
-        $tickets_for_old_price = array();
-        foreach ($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id) {
-            $ticket_id = $this->_insert_new_ticket($old_row);
-            $tickets_for_old_price[] = $ticket_id;
-            // associate to old prices
-            $this->_insert_ticket_price_relation($ticket_id, $new_price_id);
-            $this->_insert_ticket_price_relation($ticket_id, $surcharge_price_id);
-            $this->_insert_datetime_ticket_relation($new_datetime_id, $ticket_id);
-        }
-        $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_ticket_table, $tickets_for_old_price);
-    }
-    /**
-     * Creates a 4.1 price base type
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
-    private function _insert_new_price($old_price)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'PRT_ID'=>self::price_type_base,
-            'PRC_amount'=>floatval($old_price['event_cost']),
-            'PRC_name'=>$old_price['price_type'],
-            'PRC_is_default'=>false,
-            'PRC_overrides'=>false,
-            'PRC_order'=>0,
-            'PRC_deleted'=>false,
-            'PRC_parent'=>null
+		// create a ticket for each old price -old datetime combo
+		$tickets_for_old_price = array();
+		foreach ($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id) {
+			$ticket_id = $this->_insert_new_ticket($old_row);
+			$tickets_for_old_price[] = $ticket_id;
+			// associate to old prices
+			$this->_insert_ticket_price_relation($ticket_id, $new_price_id);
+			$this->_insert_ticket_price_relation($ticket_id, $surcharge_price_id);
+			$this->_insert_datetime_ticket_relation($new_datetime_id, $ticket_id);
+		}
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_ticket_table, $tickets_for_old_price);
+	}
+	/**
+	 * Creates a 4.1 price base type
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
+	private function _insert_new_price($old_price)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'PRT_ID'=>self::price_type_base,
+			'PRC_amount'=>floatval($old_price['event_cost']),
+			'PRC_name'=>$old_price['price_type'],
+			'PRC_is_default'=>false,
+			'PRC_overrides'=>false,
+			'PRC_order'=>0,
+			'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
-        );
-        $success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
-    /**
-     * Creates a 4.1 member price discount
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
+		);
+		$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
+		);
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
+	/**
+	 * Creates a 4.1 member price discount
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
 //  private function _insert_new_member_price($old_price){
 //      $discount_amount = floatval($old_price['event_cost']) - floatval($old_price['member_price']);
 //      global $wpdb;
@@ -237,207 +237,207 @@ 
 //      $new_id = $wpdb->insert_id;
 //      return $new_id;
 //  }
-    /**
-     * Creates a 4.1 member price discount
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
-    private function _insert_new_surcharge_price($old_price)
-    {
+	/**
+	 * Creates a 4.1 member price discount
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
+	private function _insert_new_surcharge_price($old_price)
+	{
 
-        if ($old_price['surcharge_type'] == 'flat_rate') {
-            $price_type = self::price_type_flat_surcharge;
-        } else {
-            $price_type = self::price_type_percent_surcharge;
-        }
-        global $wpdb;
-        $cols_n_values = array(
-            'PRT_ID'=>$price_type,
-            'PRC_amount'=>floatval($old_price['surcharge']),
-            'PRC_name'=>  __("Surcharge", "event_espresso"),
-            'PRC_is_default'=>false,
-            'PRC_overrides'=>false,
-            'PRC_order'=>20,
-            'PRC_deleted'=>false,
-            'PRC_parent'=>null
+		if ($old_price['surcharge_type'] == 'flat_rate') {
+			$price_type = self::price_type_flat_surcharge;
+		} else {
+			$price_type = self::price_type_percent_surcharge;
+		}
+		global $wpdb;
+		$cols_n_values = array(
+			'PRT_ID'=>$price_type,
+			'PRC_amount'=>floatval($old_price['surcharge']),
+			'PRC_name'=>  __("Surcharge", "event_espresso"),
+			'PRC_is_default'=>false,
+			'PRC_overrides'=>false,
+			'PRC_order'=>20,
+			'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
-        );
-        $success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
-    /**
-     * Inserts a 4.1 ticket based off the 3.1 price, and the price IDs we've already made from the 3.1 price
-     * @param $old_price_row array where keys are columns
-     * @param $new_base_price_id int
-     * @param $new_member_discount_id int
-     * @param $new_surcharge_id int
-     * @return int new ticket id
-     */
-    private function _insert_new_ticket($old_price_row)
-    {
-        global $wpdb;
-        $event_row = $this->_get_event_row($old_price_row['event_id']);
-        if ($old_price_row['surcharge_type'] == 'flat_rate') {
-            $final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
-        } else {// percent surcharge
-            $final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
-        }
-        $start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
-        $start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
-        $end_date = $event_row['registration_end']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
-        $end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
-        $cols_n_values = array(
-            'TTM_ID'=>0,
-            'TKT_name'=>$old_price_row['price_type'],
-            'TKT_description'=>'',
-            'TKT_start_date'=>$start_date_utc,
-            'TKT_end_date'=>$end_date_utc,
-            'TKT_min'=>0,
-            'TKT_max'=>-1,
-            'TKT_price'=>$final_ticket_price,
-            'TKT_sold'=> 0,// note: this will get calculated as we actually add registrations during the migration
-            'TKT_qty'=> -1,
-            'TKT_uses'=> 1,
-            'TKT_taxable'=>false,// so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
-            'TKT_is_default'=>false,
-            'TKT_order'=>$this->_get_ticket_count(),
-            'TKT_row'=>0,// doesn't matter because UI reset this on first save anyways
-            'TKT_deleted'=>false,
-            'TKT_parent'=>0
+		);
+		$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
+		);
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
+	/**
+	 * Inserts a 4.1 ticket based off the 3.1 price, and the price IDs we've already made from the 3.1 price
+	 * @param $old_price_row array where keys are columns
+	 * @param $new_base_price_id int
+	 * @param $new_member_discount_id int
+	 * @param $new_surcharge_id int
+	 * @return int new ticket id
+	 */
+	private function _insert_new_ticket($old_price_row)
+	{
+		global $wpdb;
+		$event_row = $this->_get_event_row($old_price_row['event_id']);
+		if ($old_price_row['surcharge_type'] == 'flat_rate') {
+			$final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
+		} else {// percent surcharge
+			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
+		}
+		$start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
+		$start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
+		$end_date = $event_row['registration_end']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
+		$end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
+		$cols_n_values = array(
+			'TTM_ID'=>0,
+			'TKT_name'=>$old_price_row['price_type'],
+			'TKT_description'=>'',
+			'TKT_start_date'=>$start_date_utc,
+			'TKT_end_date'=>$end_date_utc,
+			'TKT_min'=>0,
+			'TKT_max'=>-1,
+			'TKT_price'=>$final_ticket_price,
+			'TKT_sold'=> 0,// note: this will get calculated as we actually add registrations during the migration
+			'TKT_qty'=> -1,
+			'TKT_uses'=> 1,
+			'TKT_taxable'=>false,// so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
+			'TKT_is_default'=>false,
+			'TKT_order'=>$this->_get_ticket_count(),
+			'TKT_row'=>0,// doesn't matter because UI reset this on first save anyways
+			'TKT_deleted'=>false,
+			'TKT_parent'=>0
 
-        );
-        $datatypes = array(
-            '%d',// TTM_ID
-            '%s',// TKT_name
-            '%s',// TKT_description
-            '%s',// TKT_start_date
-            '%s',// TKT_end_date
-            '%d',// TKT_min
-            '%d',// TKT_max
-            '%f',// TKT_price
-            '%d',// TKT_sold
-            '%d',// TKT_qty
-            '%d',// TKT_uses
-            '%d',// TKT_taxable
-            '%d',// TKT_is_default
-            '%d',// TKT_order
-            '%d',// TKT_row
-            '%d',// TKT_deleted
-            '%d',// TKT_parent
-        );
-        $success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+		);
+		$datatypes = array(
+			'%d',// TTM_ID
+			'%s',// TKT_name
+			'%s',// TKT_description
+			'%s',// TKT_start_date
+			'%s',// TKT_end_date
+			'%d',// TKT_min
+			'%d',// TKT_max
+			'%f',// TKT_price
+			'%d',// TKT_sold
+			'%d',// TKT_qty
+			'%d',// TKT_uses
+			'%d',// TKT_taxable
+			'%d',// TKT_is_default
+			'%d',// TKT_order
+			'%d',// TKT_row
+			'%d',// TKT_deleted
+			'%d',// TKT_parent
+		);
+		$success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Adds a join between a ticket and a price
-     * @global type $wpdb
-     * @param type $new_ticket_id
-     * @param type $new_price_id
-     * @return int
-     */
-    private function _insert_ticket_price_relation($new_ticket_id, $new_price_id)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'TKT_ID'=>$new_ticket_id,
-            'PRC_ID'=>$new_price_id,
-        );
-        $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// PRC_ID
-        );
-        $success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+	/**
+	 * Adds a join between a ticket and a price
+	 * @global type $wpdb
+	 * @param type $new_ticket_id
+	 * @param type $new_price_id
+	 * @return int
+	 */
+	private function _insert_ticket_price_relation($new_ticket_id, $new_price_id)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'TKT_ID'=>$new_ticket_id,
+			'PRC_ID'=>$new_price_id,
+		);
+		$datatypes = array(
+			'%d',// TKT_ID
+			'%d',// PRC_ID
+		);
+		$success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Adds a join between a ticket and a datetime
-     * @global type $wpdb
-     * @param type $new_ticket_id
-     * @param type $new_price_id
-     * @return int
-     */
-    private function _insert_datetime_ticket_relation($new_datetime_id, $new_ticket_id)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'TKT_ID'=>$new_ticket_id,
-            'DTT_ID'=>$new_datetime_id,
-        );
-        $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// DTT_ID
-        );
-        $success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+	/**
+	 * Adds a join between a ticket and a datetime
+	 * @global type $wpdb
+	 * @param type $new_ticket_id
+	 * @param type $new_price_id
+	 * @return int
+	 */
+	private function _insert_datetime_ticket_relation($new_datetime_id, $new_ticket_id)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'TKT_ID'=>$new_ticket_id,
+			'DTT_ID'=>$new_datetime_id,
+		);
+		$datatypes = array(
+			'%d',// TKT_ID
+			'%d',// DTT_ID
+		);
+		$success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Simply gets the 3.1 event row data
-     * @global type $wpdb
-     * @param type $event_id
-     * @return array
-     */
-    private function _get_event_row($event_id)
-    {
-        global $wpdb;
-        $old_event_table = $wpdb->prefix."events_detail";
-        return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
-    }
-    /**
-     * Gets a higher ticket count than last time it was called (and is persisted between HTTP requests).
-     * Yes we COULD run a query joining events->datetimes->ticket_datetimes->tickets, but this should work fine too
-     * @return int
-     */
-    private function _get_ticket_count()
-    {
-        return $this->_ticket_count++;
-    }
+	/**
+	 * Simply gets the 3.1 event row data
+	 * @global type $wpdb
+	 * @param type $event_id
+	 * @return array
+	 */
+	private function _get_event_row($event_id)
+	{
+		global $wpdb;
+		$old_event_table = $wpdb->prefix."events_detail";
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
+	}
+	/**
+	 * Gets a higher ticket count than last time it was called (and is persisted between HTTP requests).
+	 * Yes we COULD run a query joining events->datetimes->ticket_datetimes->tickets, but this should work fine too
+	 * @return int
+	 */
+	private function _get_ticket_count()
+	{
+		return $this->_ticket_count++;
+	}
 
-    /**
-     * Using the 3.1 event id, gets the 4.1 datetimes for it
-     * @param int $old_event_id
-     * @return array where values are datetime ids
-     */
-    private function _get_datetime_ids_for_old_event_id($old_event_id)
-    {
-        global $wpdb;
-        $new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_id, $wpdb->posts);
-        $datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
-        return $datetime_ids;
-    }
+	/**
+	 * Using the 3.1 event id, gets the 4.1 datetimes for it
+	 * @param int $old_event_id
+	 * @return array where values are datetime ids
+	 */
+	private function _get_datetime_ids_for_old_event_id($old_event_id)
+	{
+		global $wpdb;
+		$new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_id, $wpdb->posts);
+		$datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
+		return $datetime_ids;
+	}
 }
 // @todo: tell users that in 3.1 the limit was on registration PER event,in 4.1 it's limit PER TICKET... SO, if they sell 2 different types of tickets
 //

Spacing +50 added lines, -50 removed lines

@@ -108,7 +108,7 @@ 
         $this->_old_table = $wpdb->prefix."events_prices";
         $this->select_expression = 'p.*, e.event_status';
         $this->_extra_where_sql = ' AS p 
-            INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON p.event_id=e.id
+            INNER JOIN ' . $wpdb->prefix.'events_detail AS e ON p.event_id=e.id
             WHERE e.event_status!="D"';
         $this->_new_price_table = $wpdb->prefix."esp_price";
         $this->_new_ticket_table = $wpdb->prefix."esp_ticket";
@@ -130,7 +130,7 @@ 
         // create the surcharge if there is any
         if (floatval($old_row['surcharge']) >= 0.01) {
             $surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
+            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id, $surcharge_price_id));
         } else {
             $surcharge_price_id = 0;
             $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
@@ -182,17 +182,17 @@ 
 
         );
         $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
         );
         $success = $wpdb->insert($this->_new_price_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_price, $this->_new_price_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -264,17 +264,17 @@ 
 
         );
         $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
         );
         $success = $wpdb->insert($this->_new_price_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_price, $this->_new_price_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -296,7 +296,7 @@ 
         if ($old_price_row['surcharge_type'] == 'flat_rate') {
             $final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
         } else {// percent surcharge
-            $final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
+            $final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge']) / 100);
         }
         $start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
         $start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
@@ -311,38 +311,38 @@ 
             'TKT_min'=>0,
             'TKT_max'=>-1,
             'TKT_price'=>$final_ticket_price,
-            'TKT_sold'=> 0,// note: this will get calculated as we actually add registrations during the migration
+            'TKT_sold'=> 0, // note: this will get calculated as we actually add registrations during the migration
             'TKT_qty'=> -1,
             'TKT_uses'=> 1,
-            'TKT_taxable'=>false,// so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
+            'TKT_taxable'=>false, // so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
             'TKT_is_default'=>false,
             'TKT_order'=>$this->_get_ticket_count(),
-            'TKT_row'=>0,// doesn't matter because UI reset this on first save anyways
+            'TKT_row'=>0, // doesn't matter because UI reset this on first save anyways
             'TKT_deleted'=>false,
             'TKT_parent'=>0
 
         );
         $datatypes = array(
-            '%d',// TTM_ID
-            '%s',// TKT_name
-            '%s',// TKT_description
-            '%s',// TKT_start_date
-            '%s',// TKT_end_date
-            '%d',// TKT_min
-            '%d',// TKT_max
-            '%f',// TKT_price
-            '%d',// TKT_sold
-            '%d',// TKT_qty
-            '%d',// TKT_uses
-            '%d',// TKT_taxable
-            '%d',// TKT_is_default
-            '%d',// TKT_order
-            '%d',// TKT_row
-            '%d',// TKT_deleted
-            '%d',// TKT_parent
+            '%d', // TTM_ID
+            '%s', // TKT_name
+            '%s', // TKT_description
+            '%s', // TKT_start_date
+            '%s', // TKT_end_date
+            '%d', // TKT_min
+            '%d', // TKT_max
+            '%f', // TKT_price
+            '%d', // TKT_sold
+            '%d', // TKT_qty
+            '%d', // TKT_uses
+            '%d', // TKT_taxable
+            '%d', // TKT_is_default
+            '%d', // TKT_order
+            '%d', // TKT_row
+            '%d', // TKT_deleted
+            '%d', // TKT_parent
         );
         $success = $wpdb->insert($this->_new_ticket_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_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -365,12 +365,12 @@ 
             'PRC_ID'=>$new_price_id,
         );
         $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// PRC_ID
+            '%d', // TKT_ID
+            '%d', // PRC_ID
         );
         $success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
+        if ( ! $success) {
+            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id, 'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
             return 0;
         }
         $new_id = $wpdb->insert_id;
@@ -392,12 +392,12 @@ 
             'DTT_ID'=>$new_datetime_id,
         );
         $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// DTT_ID
+            '%d', // TKT_ID
+            '%d', // DTT_ID
         );
         $success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
+        if ( ! $success) {
+            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id, 'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
             return 0;
         }
         $new_id = $wpdb->insert_id;

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

Indentation +78 added lines, -78 removed lines

@@ -32,87 +32,87 @@
 
 class EE_DMS_4_1_0_answers extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_answer_table;
-    private $_new_question_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Answers", "event_espresso");
-        $this->_old_table = $wpdb->prefix."events_answer";
-        // join to attendee and then join to events table
-        $this->select_expression = 'ans.*, e.event_status';
-        $this->_extra_where_sql = ' AS ans 
+	private $_new_answer_table;
+	private $_new_question_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Answers", "event_espresso");
+		$this->_old_table = $wpdb->prefix."events_answer";
+		// join to attendee and then join to events table
+		$this->select_expression = 'ans.*, e.event_status';
+		$this->_extra_where_sql = ' AS ans 
             INNER JOIN ' . $wpdb->prefix . 'events_attendee AS att ON ans.attendee_id = att.id
             INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id = e.id 
             WHERE e.event_status !="D"';
-        $this->_new_answer_table = $wpdb->prefix."esp_answer";
-        $this->_new_question_table = $wpdb->prefix."esp_question";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // get the new REGs for the old answer
-        global $wpdb;
-        $old_attendee_table = $wpdb->prefix."events_attendee";
-        $new_reg_table = $wpdb->prefix."esp_registration";
-        $regs = $this->get_migration_script()->get_mapping_new_pk($old_attendee_table, $old_row['attendee_id'], $new_reg_table);
-        if (! $regs) {
-            $this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"), $old_row['attendee_id'], $this->_json_encode($old_row)));
-            return false;
-        }
-        // as inefficient as this sounds, we create an answer per REGISTRATION, (even if the registrations use the same attendee)
-        foreach ($regs as $new_reg_id) {
-            $new_answer_id = $this->_insert_new_answer($old_row, $new_reg_id);
-        }
-    }
-    /**
-     * Creates a 4.1 price base type
-     * @global type $wpdb
-     * @param array $old_price
-     * @param int $new_reg_id
-     * @return int
-     */
-    private function _insert_new_answer($old_answer, $new_reg_id)
-    {
-        global $wpdb;
-        $old_question_table = $wpdb->prefix."events_question";
-        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($old_question_table, $old_answer['question_id'], $this->_new_question_table);
+		$this->_new_answer_table = $wpdb->prefix."esp_answer";
+		$this->_new_question_table = $wpdb->prefix."esp_question";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// get the new REGs for the old answer
+		global $wpdb;
+		$old_attendee_table = $wpdb->prefix."events_attendee";
+		$new_reg_table = $wpdb->prefix."esp_registration";
+		$regs = $this->get_migration_script()->get_mapping_new_pk($old_attendee_table, $old_row['attendee_id'], $new_reg_table);
+		if (! $regs) {
+			$this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"), $old_row['attendee_id'], $this->_json_encode($old_row)));
+			return false;
+		}
+		// as inefficient as this sounds, we create an answer per REGISTRATION, (even if the registrations use the same attendee)
+		foreach ($regs as $new_reg_id) {
+			$new_answer_id = $this->_insert_new_answer($old_row, $new_reg_id);
+		}
+	}
+	/**
+	 * Creates a 4.1 price base type
+	 * @global type $wpdb
+	 * @param array $old_price
+	 * @param int $new_reg_id
+	 * @return int
+	 */
+	private function _insert_new_answer($old_answer, $new_reg_id)
+	{
+		global $wpdb;
+		$old_question_table = $wpdb->prefix."events_question";
+		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($old_question_table, $old_answer['question_id'], $this->_new_question_table);
 
-        $question_type = $this->_get_question_type($new_question_id);
-        if (in_array($question_type, array('MULTIPLE'))) {
-            $ans_value = serialize(explode(",", stripslashes($old_answer['answer'])));
-        } else {
-            $ans_value = stripslashes($old_answer['answer']);
-        }
-        $cols_n_values = array(
-            'REG_ID'=>$new_reg_id,
-            'QST_ID'=>$new_question_id,
-            'ANS_value'=>$ans_value
-        );
-        $datatypes = array(
-            '%d',// REG_ID
-            '%d',// QST_ID
-            '%s',// ANS_value
-        );
-        $success = $wpdb->insert($this->_new_answer_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_answer, $this->_new_answer_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+		$question_type = $this->_get_question_type($new_question_id);
+		if (in_array($question_type, array('MULTIPLE'))) {
+			$ans_value = serialize(explode(",", stripslashes($old_answer['answer'])));
+		} else {
+			$ans_value = stripslashes($old_answer['answer']);
+		}
+		$cols_n_values = array(
+			'REG_ID'=>$new_reg_id,
+			'QST_ID'=>$new_question_id,
+			'ANS_value'=>$ans_value
+		);
+		$datatypes = array(
+			'%d',// REG_ID
+			'%d',// QST_ID
+			'%s',// ANS_value
+		);
+		$success = $wpdb->insert($this->_new_answer_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_answer, $this->_new_answer_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Gets the question's type
-     * @global type $wpdb
-     * @param type $question_id
-     * @return string
-     */
-    private function _get_question_type($question_id)
-    {
-        global $wpdb;
-        $type = $wpdb->get_var($wpdb->prepare("SELECT QST_type FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1", $question_id));
-        return $type;
-    }
+	/**
+	 * Gets the question's type
+	 * @global type $wpdb
+	 * @param type $question_id
+	 * @return string
+	 */
+	private function _get_question_type($question_id)
+	{
+		global $wpdb;
+		$type = $wpdb->get_var($wpdb->prepare("SELECT QST_type FROM ".$this->_new_question_table." WHERE QST_ID=%d LIMIT 1", $question_id));
+		return $type;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -42,8 +42,8 @@ 
         // join to attendee and then join to events table
         $this->select_expression = 'ans.*, e.event_status';
         $this->_extra_where_sql = ' AS ans 
-            INNER JOIN ' . $wpdb->prefix . 'events_attendee AS att ON ans.attendee_id = att.id
-            INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON att.event_id = e.id 
+            INNER JOIN ' . $wpdb->prefix.'events_attendee AS att ON ans.attendee_id = att.id
+            INNER JOIN ' . $wpdb->prefix.'events_detail AS e ON att.event_id = e.id 
             WHERE e.event_status !="D"';
         $this->_new_answer_table = $wpdb->prefix."esp_answer";
         $this->_new_question_table = $wpdb->prefix."esp_question";
@@ -56,7 +56,7 @@ 
         $old_attendee_table = $wpdb->prefix."events_attendee";
         $new_reg_table = $wpdb->prefix."esp_registration";
         $regs = $this->get_migration_script()->get_mapping_new_pk($old_attendee_table, $old_row['attendee_id'], $new_reg_table);
-        if (! $regs) {
+        if ( ! $regs) {
             $this->add_error(sprintf(__("Could not find new registrations for old attendee %d when creating answer %s", "event_espresso"), $old_row['attendee_id'], $this->_json_encode($old_row)));
             return false;
         }
@@ -90,12 +90,12 @@ 
             'ANS_value'=>$ans_value
         );
         $datatypes = array(
-            '%d',// REG_ID
-            '%d',// QST_ID
-            '%s',// ANS_value
+            '%d', // REG_ID
+            '%d', // QST_ID
+            '%s', // ANS_value
         );
         $success = $wpdb->insert($this->_new_answer_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_answer, $this->_new_answer_table, $cols_n_values, $datatypes));
             return 0;
         }

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

Indentation +142 added lines, -142 removed lines

@@ -26,160 +26,160 @@
 
 class EE_DMS_4_1_0_checkins extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Checkins', 'event_espresso');
-        $this->_old_table = $wpdb->prefix."events_attendee";
-        $this->select_expression = 'att.*, e.event_status';
-        $this->_extra_where_sql = 'AS att
+	private $_new_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Checkins', 'event_espresso');
+		$this->_old_table = $wpdb->prefix."events_attendee";
+		$this->select_expression = 'att.*, e.event_status';
+		$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->_new_table = $wpdb->prefix."esp_checkin";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        global $wpdb;
-        $new_reg_table = $wpdb->prefix."esp_registration";
+		$this->_new_table = $wpdb->prefix."esp_checkin";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		global $wpdb;
+		$new_reg_table = $wpdb->prefix."esp_registration";
 
-        $num_to_checkin_at_this_time = max(array(intval($old_row['checked_in_quantity']),intval($old_row['checked_in']))) ;
+		$num_to_checkin_at_this_time = max(array(intval($old_row['checked_in_quantity']),intval($old_row['checked_in']))) ;
 
-        $new_registrations_for_attendee = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
-        if (! $new_registrations_for_attendee) {
-            $new_registrations_for_attendee = array();
-        }
-        $new_datetime = $this->_try_to_find_datetime($old_row);
+		$new_registrations_for_attendee = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
+		if (! $new_registrations_for_attendee) {
+			$new_registrations_for_attendee = array();
+		}
+		$new_datetime = $this->_try_to_find_datetime($old_row);
 
-        // make sure registrations array is numerically indexed starting at 0 (it probably already is)
-        $new_registrations_for_attendee = array_values($new_registrations_for_attendee);
-        $new_checkin_ids = array();
-        for ($i = 0; $i<abs($num_to_checkin_at_this_time); $i++) {
-            $new_reg_id = $new_registrations_for_attendee[ $i ];
-            if (! $new_reg_id) {
-                $this->add_error(sprintf(
-                    esc_html__(
-                        /* translators: %1$s database row represented in JSON, %2$s number of registrations to check-in
+		// make sure registrations array is numerically indexed starting at 0 (it probably already is)
+		$new_registrations_for_attendee = array_values($new_registrations_for_attendee);
+		$new_checkin_ids = array();
+		for ($i = 0; $i<abs($num_to_checkin_at_this_time); $i++) {
+			$new_reg_id = $new_registrations_for_attendee[ $i ];
+			if (! $new_reg_id) {
+				$this->add_error(sprintf(
+					esc_html__(
+						/* translators: %1$s database row represented in JSON, %2$s number of registrations to check-in
                         *  %3$s number of registrations for the attendee, %4$s new registration rows represented in JSON
                         */
-                        // @codingStandardsIgnoreStart
-                        'It appears we wanted to check-in more registrations than actually exist. The old attendee record (%1$s) indicated we should check-in %2$d registrations, but there are only %3$d registrations for that attendee (%4$s)',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    $this->_json_encode($old_row),
-                    abs($num_to_checkin_at_this_time),
-                    count($new_registrations_for_attendee),
-                    $this->_json_encode($new_registrations_for_attendee)
-                ));
-                break;
-            }
-            $existing_checkin_record = $wpdb->get_var(
-                $wpdb->prepare(
-                    "SELECT CHK_ID FROM $this->_new_table WHERE REG_ID = %d ORDER BY CHK_ID DESC LIMIT 1",
-                    $new_reg_id
-                )
-            );
-            if (! $existing_checkin_record) {
-                $new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
-                if ($new_id) {
-                    $new_checkin_ids[]= $new_id;
-                }
-            }
-        }
-        if ($new_checkin_ids) {
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $old_row['id'],
-                $this->_new_table,
-                $new_checkin_ids
-            );
-        }
-    }
+						// @codingStandardsIgnoreStart
+						'It appears we wanted to check-in more registrations than actually exist. The old attendee record (%1$s) indicated we should check-in %2$d registrations, but there are only %3$d registrations for that attendee (%4$s)',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					$this->_json_encode($old_row),
+					abs($num_to_checkin_at_this_time),
+					count($new_registrations_for_attendee),
+					$this->_json_encode($new_registrations_for_attendee)
+				));
+				break;
+			}
+			$existing_checkin_record = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT CHK_ID FROM $this->_new_table WHERE REG_ID = %d ORDER BY CHK_ID DESC LIMIT 1",
+					$new_reg_id
+				)
+			);
+			if (! $existing_checkin_record) {
+				$new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
+				if ($new_id) {
+					$new_checkin_ids[]= $new_id;
+				}
+			}
+		}
+		if ($new_checkin_ids) {
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$old_row['id'],
+				$this->_new_table,
+				$new_checkin_ids
+			);
+		}
+	}
 
 
-    /**
-     * Tries to find the new datetime the Check-in was for, based on the attendee row
-     * (because we know the attendee was for an event as a specific time, and we know
-     * the event's OLD ID...)
-     * @global type $wpdb
-     * @param array $old_attendee_row
-     * @return array row of datetime from DB
-     */
-    private function _try_to_find_datetime($old_attendee)
-    {
-        global $wpdb;
+	/**
+	 * Tries to find the new datetime the Check-in was for, based on the attendee row
+	 * (because we know the attendee was for an event as a specific time, and we know
+	 * the event's OLD ID...)
+	 * @global type $wpdb
+	 * @param array $old_attendee_row
+	 * @return array row of datetime from DB
+	 */
+	private function _try_to_find_datetime($old_attendee)
+	{
+		global $wpdb;
 
-        $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__(
-                        /* translators: 1: original event ID, 2: original attendee database row */
-                        // @codingStandardsIgnoreStart
-                        'Could not find new event ID with old event ID %1$d, on attendee row %2$s; and because of that couldn\'t find the correct datetime for Check-in',
-                        // @codingStandardsIgnoreEnd
-                        'event_espresso'
-                    ),
-                    $old_attendee['event_id'],
-                    $this->_json_encode($old_attendee)
-                )
-            );
-            return 0;
-        }
-        $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");
+		$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__(
+						/* translators: 1: original event ID, 2: original attendee database row */
+						// @codingStandardsIgnoreStart
+						'Could not find new event ID with old event ID %1$d, on attendee row %2$s; and because of that couldn\'t find the correct datetime for Check-in',
+						// @codingStandardsIgnoreEnd
+						'event_espresso'
+					),
+					$old_attendee['event_id'],
+					$this->_json_encode($old_attendee)
+				)
+			);
+			return 0;
+		}
+		$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");
 
-        $datetime_table = $wpdb->prefix."esp_datetime";
-        // 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("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
-        );
-        // start running queries, widening search each time by removing a condition
-        $datetime_found = null;
-        do {
-            $full_query = "SELECT * FROM $datetime_table WHERE ".implode(" AND ", $conditions)." LIMIT 1";
-            $datetime_found = $wpdb->get_row($full_query, ARRAY_A);
-            array_shift($conditions);
-        } while (! $datetime_found && $conditions);
-        return $datetime_found;
-    }
+		$datetime_table = $wpdb->prefix."esp_datetime";
+		// 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("$datetime_table.EVT_ID = %d", $new_event_id),// events match?
+		);
+		// start running queries, widening search each time by removing a condition
+		$datetime_found = null;
+		do {
+			$full_query = "SELECT * FROM $datetime_table WHERE ".implode(" AND ", $conditions)." LIMIT 1";
+			$datetime_found = $wpdb->get_row($full_query, ARRAY_A);
+			array_shift($conditions);
+		} while (! $datetime_found && $conditions);
+		return $datetime_found;
+	}
 
-    /**
-     * Adds a new Check-in/checkout record according for $new_reg_id,$new_datetime_id,$checking_in, and $timestmap
-     * @param int $new_reg_id
-     * @param int $new_datetime_id
-     * @param string $timestamp mysql datetime
-     * @return int new Check-in id
-     */
-    private function _insert_checkin_record($new_reg_id, $new_datetime)
-    {
-        global $wpdb;
+	/**
+	 * Adds a new Check-in/checkout record according for $new_reg_id,$new_datetime_id,$checking_in, and $timestmap
+	 * @param int $new_reg_id
+	 * @param int $new_datetime_id
+	 * @param string $timestamp mysql datetime
+	 * @return int new Check-in id
+	 */
+	private function _insert_checkin_record($new_reg_id, $new_datetime)
+	{
+		global $wpdb;
 
 
-        // ok we can actually do what we set out to do: add a checkin/checkout record
-        $cols_n_values = array(
-            'REG_ID'=>$new_reg_id,
-            'DTT_ID'=>$new_datetime['DTT_ID'],
-            'CHK_in'=>true,
-            'CHK_timestamp'=>$new_datetime['DTT_EVT_start']
-        );
-        $datatypes = array(
-            '%d',// REG_ID
-            '%d',// DTT_ID
-            '%d',// CHK_in
-            '%s',// CHK_timestamp
-        );
-        $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_checkin, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+		// ok we can actually do what we set out to do: add a checkin/checkout record
+		$cols_n_values = array(
+			'REG_ID'=>$new_reg_id,
+			'DTT_ID'=>$new_datetime['DTT_ID'],
+			'CHK_in'=>true,
+			'CHK_timestamp'=>$new_datetime['DTT_EVT_start']
+		);
+		$datatypes = array(
+			'%d',// REG_ID
+			'%d',// DTT_ID
+			'%d',// CHK_in
+			'%s',// CHK_timestamp
+		);
+		$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_checkin, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -34,7 +34,7 @@ 
         $this->_old_table = $wpdb->prefix."events_attendee";
         $this->select_expression = 'att.*, e.event_status';
         $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->_new_table = $wpdb->prefix."esp_checkin";
         parent::__construct();
@@ -44,10 +44,10 @@ 
         global $wpdb;
         $new_reg_table = $wpdb->prefix."esp_registration";
 
-        $num_to_checkin_at_this_time = max(array(intval($old_row['checked_in_quantity']),intval($old_row['checked_in']))) ;
+        $num_to_checkin_at_this_time = max(array(intval($old_row['checked_in_quantity']), intval($old_row['checked_in'])));
 
         $new_registrations_for_attendee = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $new_reg_table);
-        if (! $new_registrations_for_attendee) {
+        if ( ! $new_registrations_for_attendee) {
             $new_registrations_for_attendee = array();
         }
         $new_datetime = $this->_try_to_find_datetime($old_row);
@@ -55,9 +55,9 @@ 
         // make sure registrations array is numerically indexed starting at 0 (it probably already is)
         $new_registrations_for_attendee = array_values($new_registrations_for_attendee);
         $new_checkin_ids = array();
-        for ($i = 0; $i<abs($num_to_checkin_at_this_time); $i++) {
-            $new_reg_id = $new_registrations_for_attendee[ $i ];
-            if (! $new_reg_id) {
+        for ($i = 0; $i < abs($num_to_checkin_at_this_time); $i++) {
+            $new_reg_id = $new_registrations_for_attendee[$i];
+            if ( ! $new_reg_id) {
                 $this->add_error(sprintf(
                     esc_html__(
                         /* translators: %1$s database row represented in JSON, %2$s number of registrations to check-in
@@ -81,10 +81,10 @@ 
                     $new_reg_id
                 )
             );
-            if (! $existing_checkin_record) {
+            if ( ! $existing_checkin_record) {
                 $new_id = $this->_insert_checkin_record($new_reg_id, $new_datetime);
                 if ($new_id) {
-                    $new_checkin_ids[]= $new_id;
+                    $new_checkin_ids[] = $new_id;
                 }
             }
         }
@@ -112,7 +112,7 @@ 
         global $wpdb;
 
         $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) {
+        if ( ! $new_event_id) {
             $this->add_error(
                 sprintf(
                     esc_html__(
@@ -136,8 +136,8 @@ 
         // 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("$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("$datetime_table.EVT_ID = %d", $new_event_id), // events match?
         );
         // start running queries, widening search each time by removing a condition
         $datetime_found = null;
@@ -145,7 +145,7 @@ 
             $full_query = "SELECT * FROM $datetime_table WHERE ".implode(" AND ", $conditions)." LIMIT 1";
             $datetime_found = $wpdb->get_row($full_query, ARRAY_A);
             array_shift($conditions);
-        } while (! $datetime_found && $conditions);
+        }while ( ! $datetime_found && $conditions);
         return $datetime_found;
     }
 
@@ -169,13 +169,13 @@ 
             'CHK_timestamp'=>$new_datetime['DTT_EVT_start']
         );
         $datatypes = array(
-            '%d',// REG_ID
-            '%d',// DTT_ID
-            '%d',// CHK_in
-            '%s',// CHK_timestamp
+            '%d', // REG_ID
+            '%d', // DTT_ID
+            '%d', // CHK_in
+            '%s', // CHK_timestamp
         );
         $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_checkin, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }

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

Indentation +157 added lines, -157 removed lines

@@ -38,172 +38,172 @@
  */
 class EE_DMS_4_1_0_line_items extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_line_table;
-    private $_new_transaction_table;
-    private $_new_reg_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Line Items", "event_espresso");
-        $this->_old_table = $wpdb->prefix."events_attendee";
-        $this->select_expression = 'att.*, e.event_status';
-        $this->_extra_where_sql = ' AS att
+	private $_new_line_table;
+	private $_new_transaction_table;
+	private $_new_reg_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Line Items", "event_espresso");
+		$this->_old_table = $wpdb->prefix."events_attendee";
+		$this->select_expression = 'att.*, e.event_status';
+		$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->_new_transaction_table = $wpdb->prefix."esp_transaction";
-        $this->_new_line_table = $wpdb->prefix."esp_line_item";
-        $this->_new_reg_table = $wpdb->prefix."esp_registration";
-        parent::__construct();
-    }
+		$this->_new_transaction_table = $wpdb->prefix."esp_transaction";
+		$this->_new_line_table = $wpdb->prefix."esp_line_item";
+		$this->_new_reg_table = $wpdb->prefix."esp_registration";
+		parent::__construct();
+	}
     
-    protected function _migrate_old_row($old_row)
-    {
-        // insert line items if its a primary id
-        if (intval($old_row['is_primary'])) {
-            $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
-            if (! $txn_id) {
-                $this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
-                return;
-            }
-            $txn = $this->_get_txn($txn_id);
-            $new_line_items = $this->_insert_new_line_items($txn, $old_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_line_table, $new_line_items);
-        }
-    }
+	protected function _migrate_old_row($old_row)
+	{
+		// insert line items if its a primary id
+		if (intval($old_row['is_primary'])) {
+			$txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
+			if (! $txn_id) {
+				$this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
+				return;
+			}
+			$txn = $this->_get_txn($txn_id);
+			$new_line_items = $this->_insert_new_line_items($txn, $old_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_line_table, $new_line_items);
+		}
+	}
     
-    private function _get_txn($txn_id)
-    {
-        global $wpdb;
-        $txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d", $txn_id), ARRAY_A);
-        return $txn;
-    }
+	private function _get_txn($txn_id)
+	{
+		global $wpdb;
+		$txn = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->_new_transaction_table WHERE TXN_ID=%d", $txn_id), ARRAY_A);
+		return $txn;
+	}
     
-    /**
-     * In 4.1, we'd normally need more info than just the registrations to make the line items. Ie, we'd need
-     * the transaction, and tax prices at the time of registration. (And probably promotions and other price factors).
-     * But seeing how these are REGs created from 3.1 attendee data, which have
-     * @param array $transaction
-     * @return array new line item ids
-     */
-    private function _insert_new_line_items($transaction, $old_attendee)
-    {
-        global $wpdb;
-        $regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d", $transaction['TXN_ID']), ARRAY_A);
-        $new_line_item_ids = array();
-        // create a totla line item
-        $total_line_item_id = $this->_insert_new_line_item(array(
-            'LIN_code'=>'total',
-            'TXN_ID'=>$transaction['TXN_ID'],
-            'LIN_name'=>  __("Total", "event_espresso"),
-            'LIN_total'=>$transaction['TXN_total'],
-            'LIN_type'=>'total',
-            'OBJ_ID'=>$transaction['TXN_ID'],
-            'OBJ_type'=>'Transaction'
-        ), $old_attendee);
-        $new_line_item_ids[] = $total_line_item_id;
-        // create a subtotal line item
-        $reg_total = 0;
-        foreach ($regs_on_this_transaction as $new_reg) {
-            $reg_total += floatval($new_reg['REG_final_price']);
-        }
-        $subtotal_line_item_id = $this->_insert_new_line_item(array(
-            'LIN_code'=>'sub-total',
-            'TXN_ID'=>$transaction['TXN_ID'],
-            'LIN_name'=>  __("Subtotal", "event_espresso"),
-            'LIN_total'=>$reg_total,
-            'LIN_parent'=>$total_line_item_id,
-            'LIN_type'=>'sub-total',
-        ), $old_attendee);
-        $new_line_item_ids[] = $subtotal_line_item_id;
-        // group REGs by TKT_ID
-        $regs_by_tkt = array();
-        foreach ($regs_on_this_transaction as $new_reg) {
-            $regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
-        }
+	/**
+	 * In 4.1, we'd normally need more info than just the registrations to make the line items. Ie, we'd need
+	 * the transaction, and tax prices at the time of registration. (And probably promotions and other price factors).
+	 * But seeing how these are REGs created from 3.1 attendee data, which have
+	 * @param array $transaction
+	 * @return array new line item ids
+	 */
+	private function _insert_new_line_items($transaction, $old_attendee)
+	{
+		global $wpdb;
+		$regs_on_this_transaction = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_new_reg_table." WHERE TXN_ID=%d", $transaction['TXN_ID']), ARRAY_A);
+		$new_line_item_ids = array();
+		// create a totla line item
+		$total_line_item_id = $this->_insert_new_line_item(array(
+			'LIN_code'=>'total',
+			'TXN_ID'=>$transaction['TXN_ID'],
+			'LIN_name'=>  __("Total", "event_espresso"),
+			'LIN_total'=>$transaction['TXN_total'],
+			'LIN_type'=>'total',
+			'OBJ_ID'=>$transaction['TXN_ID'],
+			'OBJ_type'=>'Transaction'
+		), $old_attendee);
+		$new_line_item_ids[] = $total_line_item_id;
+		// create a subtotal line item
+		$reg_total = 0;
+		foreach ($regs_on_this_transaction as $new_reg) {
+			$reg_total += floatval($new_reg['REG_final_price']);
+		}
+		$subtotal_line_item_id = $this->_insert_new_line_item(array(
+			'LIN_code'=>'sub-total',
+			'TXN_ID'=>$transaction['TXN_ID'],
+			'LIN_name'=>  __("Subtotal", "event_espresso"),
+			'LIN_total'=>$reg_total,
+			'LIN_parent'=>$total_line_item_id,
+			'LIN_type'=>'sub-total',
+		), $old_attendee);
+		$new_line_item_ids[] = $subtotal_line_item_id;
+		// group REGs by TKT_ID
+		$regs_by_tkt = array();
+		foreach ($regs_on_this_transaction as $new_reg) {
+			$regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
+		}
         
-        // create individual line items
+		// create individual line items
         
-        foreach ($regs_by_tkt as $ticket_id => $regs) {
-            $count = count($regs);
-            $line_total = 0;
-            foreach ($regs as $new_reg) {
-                $line_total += $new_reg['REG_final_price'];
-            }
-            $a_reg = reset($regs);
-            $new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
-            $reg_line_item_id = $this->_insert_new_line_item(array(
-                'LIN_code'=> md5('Ticket' . $ticket_id . time()),
-                'TXN_ID'=>$transaction['TXN_ID'],
-                'LIN_name'=>$new_ticket['TKT_name'],
-                'LIN_unit_price'=>$a_reg['REG_final_price'],
-                'LIN_is_taxable'=>false,
-                'LIN_total'=>$line_total,
-                'LIN_quantity'=>$count,
-                'LIN_parent'=>$subtotal_line_item_id,
-                'OBJ_ID'=>$ticket_id,
-                'OBJ_type'=>'Ticket'
-            ), $old_attendee);
-            $new_line_item_ids[] = $reg_line_item_id;
-        }
+		foreach ($regs_by_tkt as $ticket_id => $regs) {
+			$count = count($regs);
+			$line_total = 0;
+			foreach ($regs as $new_reg) {
+				$line_total += $new_reg['REG_final_price'];
+			}
+			$a_reg = reset($regs);
+			$new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
+			$reg_line_item_id = $this->_insert_new_line_item(array(
+				'LIN_code'=> md5('Ticket' . $ticket_id . time()),
+				'TXN_ID'=>$transaction['TXN_ID'],
+				'LIN_name'=>$new_ticket['TKT_name'],
+				'LIN_unit_price'=>$a_reg['REG_final_price'],
+				'LIN_is_taxable'=>false,
+				'LIN_total'=>$line_total,
+				'LIN_quantity'=>$count,
+				'LIN_parent'=>$subtotal_line_item_id,
+				'OBJ_ID'=>$ticket_id,
+				'OBJ_type'=>'Ticket'
+			), $old_attendee);
+			$new_line_item_ids[] = $reg_line_item_id;
+		}
         
             
         
-        return $new_line_item_ids;
-    }
-    /**
-     * Gets the full ticket by ID
-     * @global type $wpdb
-     * @param type $new_ticket_id
-     * @return array
-     */
-    private function _get_new_ticket_row($new_ticket_id)
-    {
-        global $wpdb;
-        $ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d", $new_ticket_id), ARRAY_A);
-        return $ticket_row;
-    }
+		return $new_line_item_ids;
+	}
+	/**
+	 * Gets the full ticket by ID
+	 * @global type $wpdb
+	 * @param type $new_ticket_id
+	 * @return array
+	 */
+	private function _get_new_ticket_row($new_ticket_id)
+	{
+		global $wpdb;
+		$ticket_row = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."esp_ticket WHERE TKT_ID=%d", $new_ticket_id), ARRAY_A);
+		return $ticket_row;
+	}
     
-    private function _insert_new_line_item($cols_n_values, $old_attendee)
-    {
-        global $wpdb;
-        $default_cols_n_values = array(
-            'LIN_code'=>'',
-            'TXN_ID'=>0,
-            'LIN_name'=>'',
-            'LIN_desc'=>'',
-            'LIN_unit_price'=>0,
-            'LIN_percent'=>0,
-            'LIN_is_taxable'=>false,
-            'LIN_order'=>0,
-            'LIN_total'=>0,
-            'LIN_quantity'=>null,
-            'LIN_parent'=>0,
-            'LIN_type'=>'line-item',
-            'OBJ_ID'=>null,
-            'OBJ_type'=>null
-        );
-        $cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
-            $datatypes = array(
-                '%s',// LIN_code
-                '%d',// TXN_ID
-                '%s',// LIN_name
-                '%s',// LIN_desc
-                '%f',// LIN_unit_price
-                '%f',// LIN_percent
-                '%d',// LIN_is_taxable
-                '%d',// LIN_order
-                '%f',// LIN_total
-                '%d',// LIN_quantity
-                '%d',// LIN_parent
-                '%s',// LIN_type
-                '%d',// OBJ_ID
-                '%s',// OBJ_type
-            );
-            $success = $wpdb->insert($this->_new_line_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;
-        }
-            return $wpdb->insert_id;
-    }
+	private function _insert_new_line_item($cols_n_values, $old_attendee)
+	{
+		global $wpdb;
+		$default_cols_n_values = array(
+			'LIN_code'=>'',
+			'TXN_ID'=>0,
+			'LIN_name'=>'',
+			'LIN_desc'=>'',
+			'LIN_unit_price'=>0,
+			'LIN_percent'=>0,
+			'LIN_is_taxable'=>false,
+			'LIN_order'=>0,
+			'LIN_total'=>0,
+			'LIN_quantity'=>null,
+			'LIN_parent'=>0,
+			'LIN_type'=>'line-item',
+			'OBJ_ID'=>null,
+			'OBJ_type'=>null
+		);
+		$cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
+			$datatypes = array(
+				'%s',// LIN_code
+				'%d',// TXN_ID
+				'%s',// LIN_name
+				'%s',// LIN_desc
+				'%f',// LIN_unit_price
+				'%f',// LIN_percent
+				'%d',// LIN_is_taxable
+				'%d',// LIN_order
+				'%f',// LIN_total
+				'%d',// LIN_quantity
+				'%d',// LIN_parent
+				'%s',// LIN_type
+				'%d',// OBJ_ID
+				'%s',// OBJ_type
+			);
+			$success = $wpdb->insert($this->_new_line_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;
+		}
+			return $wpdb->insert_id;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -48,7 +48,7 @@ 
         $this->_old_table = $wpdb->prefix."events_attendee";
         $this->select_expression = 'att.*, e.event_status';
         $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->_new_transaction_table = $wpdb->prefix."esp_transaction";
         $this->_new_line_table = $wpdb->prefix."esp_line_item";
@@ -61,7 +61,7 @@ 
         // insert line items if its a primary id
         if (intval($old_row['is_primary'])) {
             $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
-            if (! $txn_id) {
+            if ( ! $txn_id) {
                 $this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"), $old_row['id'], $this->_json_encode($old_row)));
                 return;
             }
@@ -118,7 +118,7 @@ 
         // group REGs by TKT_ID
         $regs_by_tkt = array();
         foreach ($regs_on_this_transaction as $new_reg) {
-            $regs_by_tkt[ $new_reg['TKT_ID'] ][] = $new_reg;
+            $regs_by_tkt[$new_reg['TKT_ID']][] = $new_reg;
         }
         
         // create individual line items
@@ -132,7 +132,7 @@ 
             $a_reg = reset($regs);
             $new_ticket = $this->_get_new_ticket_row($a_reg['TKT_ID']);
             $reg_line_item_id = $this->_insert_new_line_item(array(
-                'LIN_code'=> md5('Ticket' . $ticket_id . time()),
+                'LIN_code'=> md5('Ticket'.$ticket_id.time()),
                 'TXN_ID'=>$transaction['TXN_ID'],
                 'LIN_name'=>$new_ticket['TKT_name'],
                 'LIN_unit_price'=>$a_reg['REG_final_price'],
@@ -184,23 +184,23 @@ 
         );
         $cols_n_values = array_merge($default_cols_n_values, $cols_n_values);
             $datatypes = array(
-                '%s',// LIN_code
-                '%d',// TXN_ID
-                '%s',// LIN_name
-                '%s',// LIN_desc
-                '%f',// LIN_unit_price
-                '%f',// LIN_percent
-                '%d',// LIN_is_taxable
-                '%d',// LIN_order
-                '%f',// LIN_total
-                '%d',// LIN_quantity
-                '%d',// LIN_parent
-                '%s',// LIN_type
-                '%d',// OBJ_ID
-                '%s',// OBJ_type
+                '%s', // LIN_code
+                '%d', // TXN_ID
+                '%s', // LIN_name
+                '%s', // LIN_desc
+                '%f', // LIN_unit_price
+                '%f', // LIN_percent
+                '%d', // LIN_is_taxable
+                '%d', // LIN_order
+                '%f', // LIN_total
+                '%d', // LIN_quantity
+                '%d', // LIN_parent
+                '%s', // LIN_type
+                '%d', // OBJ_ID
+                '%s', // OBJ_type
             );
             $success = $wpdb->insert($this->_new_line_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;
         }

core/db_classes/EE_Ticket.class.php

Spacing +11 added lines, -11 removed lines

@@ -129,7 +129,7 @@ 
     public function ticket_status($display = false, $remaining = null)
     {
         $remaining = is_bool($remaining) ? $remaining : $this->is_remaining();
-        if (! $remaining) {
+        if ( ! $remaining) {
             return $display ? EEH_Template::pretty_status(EE_Ticket::sold_out, false, 'sentence') : EE_Ticket::sold_out;
         }
         if ($this->get('TKT_deleted')) {
@@ -247,7 +247,7 @@ 
             : '';
         $last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->get_i18n_datetime('DTT_EVT_end', $dt_frmt) : '';
 
-        return $first_date && $last_date ? $first_date . $conjunction . $last_date : '';
+        return $first_date && $last_date ? $first_date.$conjunction.$last_date : '';
     }
 
 
@@ -274,7 +274,7 @@ 
      */
     public function datetimes($query_params = array())
     {
-        if (! isset($query_params['order_by'])) {
+        if ( ! isset($query_params['order_by'])) {
             $query_params['order_by']['DTT_order'] = 'ASC';
         }
         return $this->get_many_related('Datetime', $query_params);
@@ -319,7 +319,7 @@ 
                 if (empty($tickets_sold['datetime'])) {
                     return $total;
                 }
-                if (! empty($dtt_id) && ! isset($tickets_sold['datetime'][ $dtt_id ])) {
+                if ( ! empty($dtt_id) && ! isset($tickets_sold['datetime'][$dtt_id])) {
                     EE_Error::add_error(
                         __(
                             'You\'ve requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?',
@@ -331,7 +331,7 @@ 
                     );
                     return $total;
                 }
-                return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][ $dtt_id ];
+                return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][$dtt_id];
                 break;
             default:
                 return $total;
@@ -349,9 +349,9 @@ 
     {
         $datetimes = $this->get_many_related('Datetime');
         $tickets_sold = array();
-        if (! empty($datetimes)) {
+        if ( ! empty($datetimes)) {
             foreach ($datetimes as $datetime) {
-                $tickets_sold['datetime'][ $datetime->ID() ] = $datetime->get('DTT_sold');
+                $tickets_sold['datetime'][$datetime->ID()] = $datetime->get('DTT_sold');
             }
         }
         // Tickets sold
@@ -924,7 +924,7 @@ 
                 'TKT_qty',
                 $qty
             );
-            if (! $success) {
+            if ( ! $success) {
                 // The datetimes were successfully bumped, but not the
                 // ticket. So we need to manually rollback the datetimes.
                 $this->decreaseReservedForDatetimes($qty);
@@ -1373,7 +1373,7 @@ 
         foreach ($this->datetimes() as $datetime) {
             $times[] = $datetime->start_date_and_time();
         }
-        return $this->name() . ' @ ' . implode(', ', $times) . ' for ' . $this->pretty_price();
+        return $this->name().' @ '.implode(', ', $times).' for '.$this->pretty_price();
     }
 
 
@@ -1472,7 +1472,7 @@ 
     {
         // get one datetime to use for getting the event
         $datetime = $this->first_datetime();
-        if (! $datetime instanceof \EE_Datetime) {
+        if ( ! $datetime instanceof \EE_Datetime) {
             throw new UnexpectedEntityException(
                 $datetime,
                 'EE_Datetime',
@@ -1483,7 +1483,7 @@ 
             );
         }
         $event = $datetime->event();
-        if (! $event instanceof \EE_Event) {
+        if ( ! $event instanceof \EE_Event) {
             throw new UnexpectedEntityException(
                 $event,
                 'EE_Event',

Indentation +1724 added lines, -1724 removed lines

@@ -14,1732 +14,1732 @@
 class EE_Ticket extends EE_Soft_Delete_Base_Class implements EEI_Line_Item_Object, EEI_Event_Relation, EEI_Has_Icon
 {
 
-    /**
-     * The following constants are used by the ticket_status() method to indicate whether a ticket is on sale or not.
-     */
-    const sold_out = 'TKS';
-
-    /**
-     *
-     */
-    const expired = 'TKE';
-
-    /**
-     *
-     */
-    const archived = 'TKA';
-
-    /**
-     *
-     */
-    const pending = 'TKP';
-
-    /**
-     *
-     */
-    const onsale = 'TKO';
-
-    /**
-     * extra meta key for tracking ticket reservations
-     *
-     * @type string
-     */
-    const META_KEY_TICKET_RESERVATIONS = 'ticket_reservations';
-
-    /**
-     * cached result from method of the same name
-     *
-     * @var float $_ticket_total_with_taxes
-     */
-    private $_ticket_total_with_taxes;
-
-
-    /**
-     * @param array  $props_n_values          incoming values
-     * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
-     *                                        used.)
-     * @param array  $date_formats            incoming date_formats in an array where the first value is the
-     *                                        date_format and the second value is the time format
-     * @return EE_Ticket
-     * @throws EE_Error
-     */
-    public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
-        return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values  incoming values from the database
-     * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
-     *                                the website will be used.
-     * @return EE_Ticket
-     * @throws EE_Error
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     */
-    public function parent()
-    {
-        return $this->get('TKT_parent');
-    }
-
-
-    /**
-     * return if a ticket has quantities available for purchase
-     *
-     * @param  int $DTT_ID the primary key for a particular datetime
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function available($DTT_ID = 0)
-    {
-        // are we checking availability for a particular datetime ?
-        if ($DTT_ID) {
-            // get that datetime object
-            $datetime = $this->get_first_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
-            // if  ticket sales for this datetime have exceeded the reg limit...
-            if ($datetime instanceof EE_Datetime && $datetime->sold_out()) {
-                return false;
-            }
-        }
-        // datetime is still open for registration, but is this ticket sold out ?
-        return $this->qty() < 1 || $this->qty() > $this->sold() ? true : false;
-    }
-
-
-    /**
-     * Using the start date and end date this method calculates whether the ticket is On Sale, Pending, or Expired
-     *
-     * @param bool        $display   true = we'll return a localized string, otherwise we just return the value of the
-     *                               relevant status const
-     * @param bool | null $remaining if it is already known that tickets are available, then simply pass a bool to save
-     *               further processing
-     * @return mixed status int if the display string isn't requested
-     * @throws EE_Error
-     */
-    public function ticket_status($display = false, $remaining = null)
-    {
-        $remaining = is_bool($remaining) ? $remaining : $this->is_remaining();
-        if (! $remaining) {
-            return $display ? EEH_Template::pretty_status(EE_Ticket::sold_out, false, 'sentence') : EE_Ticket::sold_out;
-        }
-        if ($this->get('TKT_deleted')) {
-            return $display ? EEH_Template::pretty_status(EE_Ticket::archived, false, 'sentence') : EE_Ticket::archived;
-        }
-        if ($this->is_expired()) {
-            return $display ? EEH_Template::pretty_status(EE_Ticket::expired, false, 'sentence') : EE_Ticket::expired;
-        }
-        if ($this->is_pending()) {
-            return $display ? EEH_Template::pretty_status(EE_Ticket::pending, false, 'sentence') : EE_Ticket::pending;
-        }
-        if ($this->is_on_sale()) {
-            return $display ? EEH_Template::pretty_status(EE_Ticket::onsale, false, 'sentence') : EE_Ticket::onsale;
-        }
-        return '';
-    }
-
-
-    /**
-     * The purpose of this method is to simply return a boolean for whether there are any tickets remaining for sale
-     * considering ALL the factors used for figuring that out.
-     *
-     * @access public
-     * @param  int $DTT_ID if an int above 0 is included here then we get a specific dtt.
-     * @return boolean         true = tickets remaining, false not.
-     * @throws EE_Error
-     */
-    public function is_remaining($DTT_ID = 0)
-    {
-        $num_remaining = $this->remaining($DTT_ID);
-        if ($num_remaining === 0) {
-            return false;
-        }
-        if ($num_remaining > 0 && $num_remaining < $this->min()) {
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * return the total number of tickets available for purchase
-     *
-     * @param  int $DTT_ID the primary key for a particular datetime.
-     *                     set to 0 for all related datetimes
-     * @return int
-     * @throws EE_Error
-     */
-    public function remaining($DTT_ID = 0)
-    {
-        return $this->real_quantity_on_ticket('saleable', $DTT_ID);
-    }
-
-
-    /**
-     * Gets min
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function min()
-    {
-        return $this->get('TKT_min');
-    }
-
-
-    /**
-     * return if a ticket is no longer available cause its available dates have expired.
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function is_expired()
-    {
-        return ($this->get_raw('TKT_end_date') < time());
-    }
-
-
-    /**
-     * Return if a ticket is yet to go on sale or not
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function is_pending()
-    {
-        return ($this->get_raw('TKT_start_date') > time());
-    }
-
-
-    /**
-     * Return if a ticket is on sale or not
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function is_on_sale()
-    {
-        return ($this->get_raw('TKT_start_date') < time() && $this->get_raw('TKT_end_date') > time());
-    }
-
-
-    /**
-     * This returns the chronologically last datetime that this ticket is associated with
-     *
-     * @param string $dt_frmt
-     * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with
-     *                            the end date ie: Jan 01 "to" Dec 31
-     * @return string
-     * @throws EE_Error
-     */
-    public function date_range($dt_frmt = '', $conjunction = ' - ')
-    {
-        $dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
-        $first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->get_i18n_datetime('DTT_EVT_start', $dt_frmt)
-            : '';
-        $last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->get_i18n_datetime('DTT_EVT_end', $dt_frmt) : '';
-
-        return $first_date && $last_date ? $first_date . $conjunction . $last_date : '';
-    }
-
-
-    /**
-     * This returns the chronologically first datetime that this ticket is associated with
-     *
-     * @return EE_Datetime
-     * @throws EE_Error
-     */
-    public function first_datetime()
-    {
-        $datetimes = $this->datetimes(array('limit' => 1));
-        return reset($datetimes);
-    }
-
-
-    /**
-     * Gets all the datetimes this ticket can be used for attending.
-     * Unless otherwise specified, orders datetimes by start date.
-     *
-     * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @return EE_Datetime[]|EE_Base_Class[]
-     * @throws EE_Error
-     */
-    public function datetimes($query_params = array())
-    {
-        if (! isset($query_params['order_by'])) {
-            $query_params['order_by']['DTT_order'] = 'ASC';
-        }
-        return $this->get_many_related('Datetime', $query_params);
-    }
-
-
-    /**
-     * This returns the chronologically last datetime that this ticket is associated with
-     *
-     * @return EE_Datetime
-     * @throws EE_Error
-     */
-    public function last_datetime()
-    {
-        $datetimes = $this->datetimes(array('limit' => 1, 'order_by' => array('DTT_EVT_start' => 'DESC')));
-        return end($datetimes);
-    }
-
-
-    /**
-     * This returns the total tickets sold depending on the given parameters.
-     *
-     * @param  string $what   Can be one of two options: 'ticket', 'datetime'.
-     *                        'ticket' = total ticket sales for all datetimes this ticket is related to
-     *                        'datetime' = total ticket sales for a specified datetime (required $dtt_id)
-     *                        'datetime' = total ticket sales in the datetime_ticket table.
-     *                        If $dtt_id is not given then we return an array of sales indexed by datetime.
-     *                        If $dtt_id IS given then we return the tickets sold for that given datetime.
-     * @param  int    $dtt_id [optional] include the dtt_id with $what = 'datetime'.
-     * @return mixed (array|int)          how many tickets have sold
-     * @throws EE_Error
-     */
-    public function tickets_sold($what = 'ticket', $dtt_id = null)
-    {
-        $total = 0;
-        $tickets_sold = $this->_all_tickets_sold();
-        switch ($what) {
-            case 'ticket':
-                return $tickets_sold['ticket'];
-                break;
-            case 'datetime':
-                if (empty($tickets_sold['datetime'])) {
-                    return $total;
-                }
-                if (! empty($dtt_id) && ! isset($tickets_sold['datetime'][ $dtt_id ])) {
-                    EE_Error::add_error(
-                        __(
-                            'You\'ve requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?',
-                            'event_espresso'
-                        ),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return $total;
-                }
-                return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][ $dtt_id ];
-                break;
-            default:
-                return $total;
-        }
-    }
-
-
-    /**
-     * This returns an array indexed by datetime_id for tickets sold with this ticket.
-     *
-     * @return EE_Ticket[]
-     * @throws EE_Error
-     */
-    protected function _all_tickets_sold()
-    {
-        $datetimes = $this->get_many_related('Datetime');
-        $tickets_sold = array();
-        if (! empty($datetimes)) {
-            foreach ($datetimes as $datetime) {
-                $tickets_sold['datetime'][ $datetime->ID() ] = $datetime->get('DTT_sold');
-            }
-        }
-        // Tickets sold
-        $tickets_sold['ticket'] = $this->sold();
-        return $tickets_sold;
-    }
-
-
-    /**
-     * This returns the base price object for the ticket.
-     *
-     * @param  bool $return_array whether to return as an array indexed by price id or just the object.
-     * @return EE_Price|EE_Base_Class|EE_Price[]|EE_Base_Class[]
-     * @throws EE_Error
-     */
-    public function base_price($return_array = false)
-    {
-        $_where = array('Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price);
-        return $return_array
-            ? $this->get_many_related('Price', array($_where))
-            : $this->get_first_related('Price', array($_where));
-    }
-
-
-    /**
-     * This returns ONLY the price modifiers for the ticket (i.e. no taxes or base price)
-     *
-     * @access public
-     * @return EE_Price[]
-     * @throws EE_Error
-     */
-    public function price_modifiers()
-    {
-        $query_params = array(
-            0 => array(
-                'Price_Type.PBT_ID' => array(
-                    'NOT IN',
-                    array(EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax),
-                ),
-            ),
-        );
-        return $this->prices($query_params);
-    }
-
-
-    /**
-     * Gets all the prices that combine to form the final price of this ticket
-     *
-     * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @return EE_Price[]|EE_Base_Class[]
-     * @throws EE_Error
-     */
-    public function prices($query_params = array())
-    {
-        return $this->get_many_related('Price', $query_params);
-    }
-
-
-    /**
-     * Gets all the ticket applicabilities (ie, relations between datetimes and tickets)
-     *
-     * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @return EE_Datetime_Ticket|EE_Base_Class[]
-     * @throws EE_Error
-     */
-    public function datetime_tickets($query_params = array())
-    {
-        return $this->get_many_related('Datetime_Ticket', $query_params);
-    }
-
-
-    /**
-     * Gets all the datetimes from the db ordered by DTT_order
-     *
-     * @param boolean $show_expired
-     * @param boolean $show_deleted
-     * @return EE_Datetime[]
-     * @throws EE_Error
-     */
-    public function datetimes_ordered($show_expired = true, $show_deleted = false)
-    {
-        return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_ticket_ordered_by_DTT_order(
-            $this->ID(),
-            $show_expired,
-            $show_deleted
-        );
-    }
-
-
-    /**
-     * Gets ID
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function ID()
-    {
-        return $this->get('TKT_ID');
-    }
-
-
-    /**
-     * get the author of the ticket.
-     *
-     * @since 4.5.0
-     * @return int
-     * @throws EE_Error
-     */
-    public function wp_user()
-    {
-        return $this->get('TKT_wp_user');
-    }
-
-
-    /**
-     * Gets the template for the ticket
-     *
-     * @return EE_Ticket_Template|EE_Base_Class
-     * @throws EE_Error
-     */
-    public function template()
-    {
-        return $this->get_first_related('Ticket_Template');
-    }
-
-
-    /**
-     * Simply returns an array of EE_Price objects that are taxes.
-     *
-     * @return EE_Price[]
-     * @throws EE_Error
-     */
-    public function get_ticket_taxes_for_admin()
-    {
-        return EE_Taxes::get_taxes_for_admin();
-    }
-
-
-    /**
-     * @return float
-     * @throws EE_Error
-     */
-    public function ticket_price()
-    {
-        return $this->get('TKT_price');
-    }
-
-
-    /**
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function pretty_price()
-    {
-        return $this->get_pretty('TKT_price');
-    }
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     */
-    public function is_free()
-    {
-        return $this->get_ticket_total_with_taxes() === (float) 0;
-    }
-
-
-    /**
-     * get_ticket_total_with_taxes
-     *
-     * @param bool $no_cache
-     * @return float
-     * @throws EE_Error
-     */
-    public function get_ticket_total_with_taxes($no_cache = false)
-    {
-        if ($this->_ticket_total_with_taxes === null || $no_cache) {
-            $this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
-        }
-        return (float) $this->_ticket_total_with_taxes;
-    }
-
-
-    public function ensure_TKT_Price_correct()
-    {
-        $this->set('TKT_price', EE_Taxes::get_subtotal_for_admin($this));
-        $this->save();
-    }
-
-
-    /**
-     * @return float
-     * @throws EE_Error
-     */
-    public function get_ticket_subtotal()
-    {
-        return EE_Taxes::get_subtotal_for_admin($this);
-    }
-
-
-    /**
-     * Returns the total taxes applied to this ticket
-     *
-     * @return float
-     * @throws EE_Error
-     */
-    public function get_ticket_taxes_total_for_admin()
-    {
-        return EE_Taxes::get_total_taxes_for_admin($this);
-    }
-
-
-    /**
-     * Sets name
-     *
-     * @param string $name
-     * @throws EE_Error
-     */
-    public function set_name($name)
-    {
-        $this->set('TKT_name', $name);
-    }
-
-
-    /**
-     * Gets description
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function description()
-    {
-        return $this->get('TKT_description');
-    }
-
-
-    /**
-     * Sets description
-     *
-     * @param string $description
-     * @throws EE_Error
-     */
-    public function set_description($description)
-    {
-        $this->set('TKT_description', $description);
-    }
-
-
-    /**
-     * Gets start_date
-     *
-     * @param string $dt_frmt
-     * @param string $tm_frmt
-     * @return string
-     * @throws EE_Error
-     */
-    public function start_date($dt_frmt = '', $tm_frmt = '')
-    {
-        return $this->_get_datetime('TKT_start_date', $dt_frmt, $tm_frmt);
-    }
-
-
-    /**
-     * Sets start_date
-     *
-     * @param string $start_date
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_start_date($start_date)
-    {
-        $this->_set_date_time('B', $start_date, 'TKT_start_date');
-    }
-
-
-    /**
-     * Gets end_date
-     *
-     * @param string $dt_frmt
-     * @param string $tm_frmt
-     * @return string
-     * @throws EE_Error
-     */
-    public function end_date($dt_frmt = '', $tm_frmt = '')
-    {
-        return $this->_get_datetime('TKT_end_date', $dt_frmt, $tm_frmt);
-    }
-
-
-    /**
-     * Sets end_date
-     *
-     * @param string $end_date
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_end_date($end_date)
-    {
-        $this->_set_date_time('B', $end_date, 'TKT_end_date');
-    }
-
-
-    /**
-     * Sets sell until time
-     *
-     * @since 4.5.0
-     * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
-     * @throws EE_Error
-     */
-    public function set_end_time($time)
-    {
-        $this->_set_time_for($time, 'TKT_end_date');
-    }
-
-
-    /**
-     * Sets min
-     *
-     * @param int $min
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_min($min)
-    {
-        $this->set('TKT_min', $min);
-    }
-
-
-    /**
-     * Gets max
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function max()
-    {
-        return $this->get('TKT_max');
-    }
-
-
-    /**
-     * Sets max
-     *
-     * @param int $max
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_max($max)
-    {
-        $this->set('TKT_max', $max);
-    }
-
-
-    /**
-     * Sets price
-     *
-     * @param float $price
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_price($price)
-    {
-        $this->set('TKT_price', $price);
-    }
-
-
-    /**
-     * Gets sold
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function sold()
-    {
-        return $this->get_raw('TKT_sold');
-    }
-
-
-    /**
-     * Sets sold
-     *
-     * @param int $sold
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_sold($sold)
-    {
-        // sold can not go below zero
-        $sold = max(0, $sold);
-        $this->set('TKT_sold', $sold);
-    }
-
-
-    /**
-     * Increments sold by amount passed by $qty AND decrements the reserved count on both this ticket and its
-     * associated datetimes.
-     *
-     * @since 4.9.80.p
-     * @param int $qty
-     * @return boolean
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function increaseSold($qty = 1)
-    {
-        $qty = absint($qty);
-        // increment sold and decrement reserved datetime quantities simultaneously
-        // don't worry about failures, because they must have already had a spot reserved
-        $this->increaseSoldForDatetimes($qty);
-        // Increment and decrement ticket quantities simultaneously
-        $success = $this->adjustNumericFieldsInDb(
-            [
-                'TKT_reserved' => $qty * -1,
-                'TKT_sold' => $qty
-            ]
-        );
-        do_action(
-            'AHEE__EE_Ticket__increase_sold',
-            $this,
-            $qty,
-            $this->sold(),
-            $success
-        );
-        return $success;
-    }
-
-    /**
-     * On each datetime related to this ticket, increases its sold count and decreases its reserved count by $qty.
-     *
-     * @since 4.9.80.p
-     * @param int $qty positive or negative. Positive means to increase sold counts (and decrease reserved counts),
-     *             Negative means to decreases old counts (and increase reserved counts).
-     * @param EE_Datetime[] $datetimes
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function increaseSoldForDatetimes($qty, array $datetimes = [])
-    {
-        $datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
-        foreach ($datetimes as $datetime) {
-            $datetime->increaseSold($qty);
-        }
-    }
-
-
-
-    /**
-     * Decrements (subtracts) sold by amount passed by $qty on both the ticket and its related datetimes directly in the
-     * DB and then updates the model objects.
-     * Does not affect the reserved counts.
-     *
-     * @since 4.9.80.p
-     * @param int $qty
-     * @return boolean
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function decreaseSold($qty = 1)
-    {
-        $qty = absint($qty);
-        $this->decreaseSoldForDatetimes($qty);
-        $success = $this->adjustNumericFieldsInDb(
-            [
-                'TKT_sold' => $qty * -1
-            ]
-        );
-        do_action(
-            'AHEE__EE_Ticket__decrease_sold',
-            $this,
-            $qty,
-            $this->sold(),
-            $success
-        );
-        return $success;
-    }
-
-
-    /**
-     * Decreases sold on related datetimes
-     *
-     * @since 4.9.80.p
-     * @param int $qty
-     * @param EE_Datetime[] $datetimes
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function decreaseSoldForDatetimes($qty = 1, array $datetimes = [])
-    {
-        $datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
-        if (is_array($datetimes)) {
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-                    $datetime->decreaseSold($qty);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Gets qty of reserved tickets
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function reserved()
-    {
-        return $this->get_raw('TKT_reserved');
-    }
-
-
-    /**
-     * Sets reserved
-     *
-     * @param int $reserved
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_reserved($reserved)
-    {
-        // reserved can not go below zero
-        $reserved = max(0, (int) $reserved);
-        $this->set('TKT_reserved', $reserved);
-    }
-
-
-    /**
-     * Increments reserved by amount passed by $qty, and persists it immediately to the database.
-     *
-     * @since 4.9.80.p
-     * @param int    $qty
-     * @param string $source
-     * @return bool whether we successfully reserved the ticket or not.
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function increaseReserved($qty = 1, $source = 'unknown')
-    {
-        $qty = absint($qty);
-        do_action(
-            'AHEE__EE_Ticket__increase_reserved__begin',
-            $this,
-            $qty,
-            $source
-        );
-        $this->add_extra_meta(EE_Ticket::META_KEY_TICKET_RESERVATIONS, "{$qty} from {$source}");
-        $success = false;
-        $datetimes_adjusted_successfully = $this->increaseReservedForDatetimes($qty);
-        if ($datetimes_adjusted_successfully) {
-            $success = $this->incrementFieldConditionallyInDb(
-                'TKT_reserved',
-                'TKT_sold',
-                'TKT_qty',
-                $qty
-            );
-            if (! $success) {
-                // The datetimes were successfully bumped, but not the
-                // ticket. So we need to manually rollback the datetimes.
-                $this->decreaseReservedForDatetimes($qty);
-            }
-        }
-        do_action(
-            'AHEE__EE_Ticket__increase_reserved',
-            $this,
-            $qty,
-            $this->reserved(),
-            $success
-        );
-        return $success;
-    }
-
-
-    /**
-     * Increases reserved counts on related datetimes
-     *
-     * @since 4.9.80.p
-     * @param int $qty
-     * @param EE_Datetime[] $datetimes
-     * @return boolean indicating success
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function increaseReservedForDatetimes($qty = 1, array $datetimes = [])
-    {
-        $datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
-        $datetimes_updated = [];
-        $limit_exceeded = false;
-        if (is_array($datetimes)) {
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-                    if ($datetime->increaseReserved($qty)) {
-                        $datetimes_updated[] = $datetime;
-                    } else {
-                        $limit_exceeded = true;
-                        break;
-                    }
-                }
-            }
-            // If somewhere along the way we detected a datetime whose
-            // limit was exceeded, do a manual rollback.
-            if ($limit_exceeded) {
-                $this->decreaseReservedForDatetimes($qty, $datetimes_updated);
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * Decrements (subtracts) reserved by amount passed by $qty, and persists it immediately to the database.
-     *
-     * @since 4.9.80.p
-     * @param int    $qty
-     * @param bool   $adjust_datetimes
-     * @param string $source
-     * @return boolean
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function decreaseReserved($qty = 1, $adjust_datetimes = true, $source = 'unknown')
-    {
-        $qty = absint($qty);
-        $this->add_extra_meta(EE_Ticket::META_KEY_TICKET_RESERVATIONS, "-{$qty} from {$source}");
-        if ($adjust_datetimes) {
-            $this->decreaseReservedForDatetimes($qty);
-        }
-        $success = $this->adjustNumericFieldsInDb(
-            [
-                'TKT_reserved' => $qty * -1
-            ]
-        );
-        do_action(
-            'AHEE__EE_Ticket__decrease_reserved',
-            $this,
-            $qty,
-            $this->reserved(),
-            $success
-        );
-        return $success;
-    }
-
-
-    /**
-     * Decreases the reserved count on the specified datetimes.
-     *
-     * @since 4.9.80.p
-     * @param int           $qty
-     * @param EE_Datetime[] $datetimes
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function decreaseReservedForDatetimes($qty = 1, array $datetimes = [])
-    {
-        $datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $datetime->decreaseReserved($qty);
-            }
-        }
-    }
-
-
-    /**
-     * Gets ticket quantity
-     *
-     * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
-     *                            therefore $context can be one of three values: '', 'reg_limit', or 'saleable'
-     *                            '' (default) quantity is the actual db value for TKT_qty, unaffected by other objects
-     *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
-     *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
-     *                            is therefore the truest measure of tickets that can be purchased at the moment
-     * @return int
-     * @throws EE_Error
-     */
-    public function qty($context = '')
-    {
-        switch ($context) {
-            case 'reg_limit':
-                return $this->real_quantity_on_ticket();
-            case 'saleable':
-                return $this->real_quantity_on_ticket('saleable');
-            default:
-                return $this->get_raw('TKT_qty');
-        }
-    }
-
-
-    /**
-     * Gets ticket quantity
-     *
-     * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
-     *                            therefore $context can be one of two values: 'reg_limit', or 'saleable'
-     *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
-     *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
-     *                            is therefore the truest measure of tickets that can be purchased at the moment
-     * @param  int   $DTT_ID      the primary key for a particular datetime.
-     *                            set to 0 for all related datetimes
-     * @return int
-     * @throws EE_Error
-     */
-    public function real_quantity_on_ticket($context = 'reg_limit', $DTT_ID = 0)
-    {
-        $raw = $this->get_raw('TKT_qty');
-        // return immediately if it's zero
-        if ($raw === 0) {
-            return $raw;
-        }
-        // echo "\n\n<br />Ticket: " . $this->name() . '<br />';
-        // ensure qty doesn't exceed raw value for THIS ticket
-        $qty = min(EE_INF, $raw);
-        // echo "\n . qty: " . $qty . '<br />';
-        // calculate this ticket's total sales and reservations
-        $sold_and_reserved_for_this_ticket = $this->sold() + $this->reserved();
-        // echo "\n . sold: " . $this->sold() . '<br />';
-        // echo "\n . reserved: " . $this->reserved() . '<br />';
-        // echo "\n . sold_and_reserved_for_this_ticket: " . $sold_and_reserved_for_this_ticket . '<br />';
-        // first we need to calculate the maximum number of tickets available for the datetime
-        // do we want data for one datetime or all of them ?
-        $query_params = $DTT_ID ? array(array('DTT_ID' => $DTT_ID)) : array();
-        $datetimes = $this->datetimes($query_params);
-        if (is_array($datetimes) && ! empty($datetimes)) {
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-                    $datetime->refresh_from_db();
-                    // echo "\n . . datetime name: " . $datetime->name() . '<br />';
-                    // echo "\n . . datetime ID: " . $datetime->ID() . '<br />';
-                    // initialize with no restrictions for each datetime
-                    // but adjust datetime qty based on datetime reg limit
-                    $datetime_qty = min(EE_INF, $datetime->reg_limit());
-                    // echo "\n . . . datetime reg_limit: " . $datetime->reg_limit() . '<br />';
-                    // echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
-                    // if we want the actual saleable amount, then we need to consider OTHER ticket sales
-                    // and reservations for this datetime, that do NOT include sales and reservations
-                    // for this ticket (so we add $this->sold() and $this->reserved() back in)
-                    if ($context === 'saleable') {
-                        $datetime_qty = max(
-                            $datetime_qty - $datetime->sold_and_reserved() + $sold_and_reserved_for_this_ticket,
-                            0
-                        );
-                        // echo "\n . . . datetime sold: " . $datetime->sold() . '<br />';
-                        // echo "\n . . . datetime reserved: " . $datetime->reserved() . '<br />';
-                        // echo "\n . . . datetime sold_and_reserved: " . $datetime->sold_and_reserved() . '<br />';
-                        // echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
-                        $datetime_qty = ! $datetime->sold_out() ? $datetime_qty : 0;
-                        // echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
-                    }
-                    $qty = min($datetime_qty, $qty);
-                    // echo "\n . . qty: " . $qty . '<br />';
-                }
-            }
-        }
-        // NOW that we know the  maximum number of tickets available for the datetime
-        // we can finally factor in the details for this specific ticket
-        if ($qty > 0 && $context === 'saleable') {
-            // and subtract the sales for THIS ticket
-            $qty = max($qty - $sold_and_reserved_for_this_ticket, 0);
-            // echo "\n . qty: " . $qty . '<br />';
-        }
-        // echo "\nFINAL QTY: " . $qty . "<br /><br />";
-        return $qty;
-    }
-
-
-    /**
-     * Sets qty - IMPORTANT!!! Does NOT allow QTY to be set higher than the lowest reg limit of any related datetimes
-     *
-     * @param int $qty
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_qty($qty)
-    {
-        $datetimes = $this->datetimes();
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $qty = min($qty, $datetime->reg_limit());
-            }
-        }
-        $this->set('TKT_qty', $qty);
-    }
-
-
-    /**
-     * Gets uses
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function uses()
-    {
-        return $this->get('TKT_uses');
-    }
-
-
-    /**
-     * Sets uses
-     *
-     * @param int $uses
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_uses($uses)
-    {
-        $this->set('TKT_uses', $uses);
-    }
-
-
-    /**
-     * returns whether ticket is required or not.
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function required()
-    {
-        return $this->get('TKT_required');
-    }
-
-
-    /**
-     * sets the TKT_required property
-     *
-     * @param boolean $required
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_required($required)
-    {
-        $this->set('TKT_required', $required);
-    }
-
-
-    /**
-     * Gets taxable
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function taxable()
-    {
-        return $this->get('TKT_taxable');
-    }
-
-
-    /**
-     * Sets taxable
-     *
-     * @param boolean $taxable
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_taxable($taxable)
-    {
-        $this->set('TKT_taxable', $taxable);
-    }
-
-
-    /**
-     * Gets is_default
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function is_default()
-    {
-        return $this->get('TKT_is_default');
-    }
-
-
-    /**
-     * Sets is_default
-     *
-     * @param boolean $is_default
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_is_default($is_default)
-    {
-        $this->set('TKT_is_default', $is_default);
-    }
-
-
-    /**
-     * Gets order
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function order()
-    {
-        return $this->get('TKT_order');
-    }
-
-
-    /**
-     * Sets order
-     *
-     * @param int $order
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_order($order)
-    {
-        $this->set('TKT_order', $order);
-    }
-
-
-    /**
-     * Gets row
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function row()
-    {
-        return $this->get('TKT_row');
-    }
-
-
-    /**
-     * Sets row
-     *
-     * @param int $row
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_row($row)
-    {
-        $this->set('TKT_row', $row);
-    }
-
-
-    /**
-     * Gets deleted
-     *
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function deleted()
-    {
-        return $this->get('TKT_deleted');
-    }
-
-
-    /**
-     * Sets deleted
-     *
-     * @param boolean $deleted
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_deleted($deleted)
-    {
-        $this->set('TKT_deleted', $deleted);
-    }
-
-
-    /**
-     * Gets parent
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function parent_ID()
-    {
-        return $this->get('TKT_parent');
-    }
-
-
-    /**
-     * Sets parent
-     *
-     * @param int $parent
-     * @return void
-     * @throws EE_Error
-     */
-    public function set_parent_ID($parent)
-    {
-        $this->set('TKT_parent', $parent);
-    }
-
-
-    /**
-     * Gets a string which is handy for showing in gateways etc that describes the ticket.
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function name_and_info()
-    {
-        $times = array();
-        foreach ($this->datetimes() as $datetime) {
-            $times[] = $datetime->start_date_and_time();
-        }
-        return $this->name() . ' @ ' . implode(', ', $times) . ' for ' . $this->pretty_price();
-    }
-
-
-    /**
-     * Gets name
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function name()
-    {
-        return $this->get('TKT_name');
-    }
-
-
-    /**
-     * Gets price
-     *
-     * @return float
-     * @throws EE_Error
-     */
-    public function price()
-    {
-        return $this->get('TKT_price');
-    }
-
-
-    /**
-     * Gets all the registrations for this ticket
-     *
-     * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @return EE_Registration[]|EE_Base_Class[]
-     * @throws EE_Error
-     */
-    public function registrations($query_params = array())
-    {
-        return $this->get_many_related('Registration', $query_params);
-    }
-
-
-    /**
-     * Updates the TKT_sold attribute (and saves) based on the number of APPROVED registrations for this ticket.
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function update_tickets_sold()
-    {
-        $count_regs_for_this_ticket = $this->count_registrations(
-            array(
-                array(
-                    'STS_ID'      => EEM_Registration::status_id_approved,
-                    'REG_deleted' => 0,
-                ),
-            )
-        );
-        $this->set_sold($count_regs_for_this_ticket);
-        $this->save();
-        return $count_regs_for_this_ticket;
-    }
-
-
-    /**
-     * Counts the registrations for this ticket
-     *
-     * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @return int
-     */
-    public function count_registrations($query_params = array())
-    {
-        return $this->count_related('Registration', $query_params);
-    }
-
-
-    /**
-     * Implementation for EEI_Has_Icon interface method.
-     *
-     * @see EEI_Visual_Representation for comments
-     * @return string
-     */
-    public function get_icon()
-    {
-        return '<span class="dashicons dashicons-tickets-alt"></span>';
-    }
-
-
-    /**
-     * Implementation of the EEI_Event_Relation interface method
-     *
-     * @see EEI_Event_Relation for comments
-     * @return EE_Event
-     * @throws EE_Error
-     * @throws UnexpectedEntityException
-     */
-    public function get_related_event()
-    {
-        // get one datetime to use for getting the event
-        $datetime = $this->first_datetime();
-        if (! $datetime instanceof \EE_Datetime) {
-            throw new UnexpectedEntityException(
-                $datetime,
-                'EE_Datetime',
-                sprintf(
-                    __('The ticket (%s) is not associated with any valid datetimes.', 'event_espresso'),
-                    $this->name()
-                )
-            );
-        }
-        $event = $datetime->event();
-        if (! $event instanceof \EE_Event) {
-            throw new UnexpectedEntityException(
-                $event,
-                'EE_Event',
-                sprintf(
-                    __('The ticket (%s) is not associated with a valid event.', 'event_espresso'),
-                    $this->name()
-                )
-            );
-        }
-        return $event;
-    }
-
-
-    /**
-     * Implementation of the EEI_Event_Relation interface method
-     *
-     * @see EEI_Event_Relation for comments
-     * @return string
-     * @throws UnexpectedEntityException
-     * @throws EE_Error
-     */
-    public function get_event_name()
-    {
-        $event = $this->get_related_event();
-        return $event instanceof EE_Event ? $event->name() : '';
-    }
-
-
-    /**
-     * Implementation of the EEI_Event_Relation interface method
-     *
-     * @see EEI_Event_Relation for comments
-     * @return int
-     * @throws UnexpectedEntityException
-     * @throws EE_Error
-     */
-    public function get_event_ID()
-    {
-        $event = $this->get_related_event();
-        return $event instanceof EE_Event ? $event->ID() : 0;
-    }
-
-
-    /**
-     * This simply returns whether a ticket can be permanently deleted or not.
-     * The criteria for determining this is whether the ticket has any related registrations.
-     * If there are none then it can be permanently deleted.
-     *
-     * @return bool
-     */
-    public function is_permanently_deleteable()
-    {
-        return $this->count_registrations() === 0;
-    }
-
-
-    /*******************************************************************
+	/**
+	 * The following constants are used by the ticket_status() method to indicate whether a ticket is on sale or not.
+	 */
+	const sold_out = 'TKS';
+
+	/**
+	 *
+	 */
+	const expired = 'TKE';
+
+	/**
+	 *
+	 */
+	const archived = 'TKA';
+
+	/**
+	 *
+	 */
+	const pending = 'TKP';
+
+	/**
+	 *
+	 */
+	const onsale = 'TKO';
+
+	/**
+	 * extra meta key for tracking ticket reservations
+	 *
+	 * @type string
+	 */
+	const META_KEY_TICKET_RESERVATIONS = 'ticket_reservations';
+
+	/**
+	 * cached result from method of the same name
+	 *
+	 * @var float $_ticket_total_with_taxes
+	 */
+	private $_ticket_total_with_taxes;
+
+
+	/**
+	 * @param array  $props_n_values          incoming values
+	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
+	 *                                        used.)
+	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 *                                        date_format and the second value is the time format
+	 * @return EE_Ticket
+	 * @throws EE_Error
+	 */
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values  incoming values from the database
+	 * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
+	 *                                the website will be used.
+	 * @return EE_Ticket
+	 * @throws EE_Error
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	public function parent()
+	{
+		return $this->get('TKT_parent');
+	}
+
+
+	/**
+	 * return if a ticket has quantities available for purchase
+	 *
+	 * @param  int $DTT_ID the primary key for a particular datetime
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function available($DTT_ID = 0)
+	{
+		// are we checking availability for a particular datetime ?
+		if ($DTT_ID) {
+			// get that datetime object
+			$datetime = $this->get_first_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
+			// if  ticket sales for this datetime have exceeded the reg limit...
+			if ($datetime instanceof EE_Datetime && $datetime->sold_out()) {
+				return false;
+			}
+		}
+		// datetime is still open for registration, but is this ticket sold out ?
+		return $this->qty() < 1 || $this->qty() > $this->sold() ? true : false;
+	}
+
+
+	/**
+	 * Using the start date and end date this method calculates whether the ticket is On Sale, Pending, or Expired
+	 *
+	 * @param bool        $display   true = we'll return a localized string, otherwise we just return the value of the
+	 *                               relevant status const
+	 * @param bool | null $remaining if it is already known that tickets are available, then simply pass a bool to save
+	 *               further processing
+	 * @return mixed status int if the display string isn't requested
+	 * @throws EE_Error
+	 */
+	public function ticket_status($display = false, $remaining = null)
+	{
+		$remaining = is_bool($remaining) ? $remaining : $this->is_remaining();
+		if (! $remaining) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::sold_out, false, 'sentence') : EE_Ticket::sold_out;
+		}
+		if ($this->get('TKT_deleted')) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::archived, false, 'sentence') : EE_Ticket::archived;
+		}
+		if ($this->is_expired()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::expired, false, 'sentence') : EE_Ticket::expired;
+		}
+		if ($this->is_pending()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::pending, false, 'sentence') : EE_Ticket::pending;
+		}
+		if ($this->is_on_sale()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::onsale, false, 'sentence') : EE_Ticket::onsale;
+		}
+		return '';
+	}
+
+
+	/**
+	 * The purpose of this method is to simply return a boolean for whether there are any tickets remaining for sale
+	 * considering ALL the factors used for figuring that out.
+	 *
+	 * @access public
+	 * @param  int $DTT_ID if an int above 0 is included here then we get a specific dtt.
+	 * @return boolean         true = tickets remaining, false not.
+	 * @throws EE_Error
+	 */
+	public function is_remaining($DTT_ID = 0)
+	{
+		$num_remaining = $this->remaining($DTT_ID);
+		if ($num_remaining === 0) {
+			return false;
+		}
+		if ($num_remaining > 0 && $num_remaining < $this->min()) {
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * return the total number of tickets available for purchase
+	 *
+	 * @param  int $DTT_ID the primary key for a particular datetime.
+	 *                     set to 0 for all related datetimes
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function remaining($DTT_ID = 0)
+	{
+		return $this->real_quantity_on_ticket('saleable', $DTT_ID);
+	}
+
+
+	/**
+	 * Gets min
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function min()
+	{
+		return $this->get('TKT_min');
+	}
+
+
+	/**
+	 * return if a ticket is no longer available cause its available dates have expired.
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function is_expired()
+	{
+		return ($this->get_raw('TKT_end_date') < time());
+	}
+
+
+	/**
+	 * Return if a ticket is yet to go on sale or not
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function is_pending()
+	{
+		return ($this->get_raw('TKT_start_date') > time());
+	}
+
+
+	/**
+	 * Return if a ticket is on sale or not
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function is_on_sale()
+	{
+		return ($this->get_raw('TKT_start_date') < time() && $this->get_raw('TKT_end_date') > time());
+	}
+
+
+	/**
+	 * This returns the chronologically last datetime that this ticket is associated with
+	 *
+	 * @param string $dt_frmt
+	 * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with
+	 *                            the end date ie: Jan 01 "to" Dec 31
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function date_range($dt_frmt = '', $conjunction = ' - ')
+	{
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
+		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->get_i18n_datetime('DTT_EVT_start', $dt_frmt)
+			: '';
+		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->get_i18n_datetime('DTT_EVT_end', $dt_frmt) : '';
+
+		return $first_date && $last_date ? $first_date . $conjunction . $last_date : '';
+	}
+
+
+	/**
+	 * This returns the chronologically first datetime that this ticket is associated with
+	 *
+	 * @return EE_Datetime
+	 * @throws EE_Error
+	 */
+	public function first_datetime()
+	{
+		$datetimes = $this->datetimes(array('limit' => 1));
+		return reset($datetimes);
+	}
+
+
+	/**
+	 * Gets all the datetimes this ticket can be used for attending.
+	 * Unless otherwise specified, orders datetimes by start date.
+	 *
+	 * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @return EE_Datetime[]|EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	public function datetimes($query_params = array())
+	{
+		if (! isset($query_params['order_by'])) {
+			$query_params['order_by']['DTT_order'] = 'ASC';
+		}
+		return $this->get_many_related('Datetime', $query_params);
+	}
+
+
+	/**
+	 * This returns the chronologically last datetime that this ticket is associated with
+	 *
+	 * @return EE_Datetime
+	 * @throws EE_Error
+	 */
+	public function last_datetime()
+	{
+		$datetimes = $this->datetimes(array('limit' => 1, 'order_by' => array('DTT_EVT_start' => 'DESC')));
+		return end($datetimes);
+	}
+
+
+	/**
+	 * This returns the total tickets sold depending on the given parameters.
+	 *
+	 * @param  string $what   Can be one of two options: 'ticket', 'datetime'.
+	 *                        'ticket' = total ticket sales for all datetimes this ticket is related to
+	 *                        'datetime' = total ticket sales for a specified datetime (required $dtt_id)
+	 *                        'datetime' = total ticket sales in the datetime_ticket table.
+	 *                        If $dtt_id is not given then we return an array of sales indexed by datetime.
+	 *                        If $dtt_id IS given then we return the tickets sold for that given datetime.
+	 * @param  int    $dtt_id [optional] include the dtt_id with $what = 'datetime'.
+	 * @return mixed (array|int)          how many tickets have sold
+	 * @throws EE_Error
+	 */
+	public function tickets_sold($what = 'ticket', $dtt_id = null)
+	{
+		$total = 0;
+		$tickets_sold = $this->_all_tickets_sold();
+		switch ($what) {
+			case 'ticket':
+				return $tickets_sold['ticket'];
+				break;
+			case 'datetime':
+				if (empty($tickets_sold['datetime'])) {
+					return $total;
+				}
+				if (! empty($dtt_id) && ! isset($tickets_sold['datetime'][ $dtt_id ])) {
+					EE_Error::add_error(
+						__(
+							'You\'ve requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?',
+							'event_espresso'
+						),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return $total;
+				}
+				return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][ $dtt_id ];
+				break;
+			default:
+				return $total;
+		}
+	}
+
+
+	/**
+	 * This returns an array indexed by datetime_id for tickets sold with this ticket.
+	 *
+	 * @return EE_Ticket[]
+	 * @throws EE_Error
+	 */
+	protected function _all_tickets_sold()
+	{
+		$datetimes = $this->get_many_related('Datetime');
+		$tickets_sold = array();
+		if (! empty($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				$tickets_sold['datetime'][ $datetime->ID() ] = $datetime->get('DTT_sold');
+			}
+		}
+		// Tickets sold
+		$tickets_sold['ticket'] = $this->sold();
+		return $tickets_sold;
+	}
+
+
+	/**
+	 * This returns the base price object for the ticket.
+	 *
+	 * @param  bool $return_array whether to return as an array indexed by price id or just the object.
+	 * @return EE_Price|EE_Base_Class|EE_Price[]|EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	public function base_price($return_array = false)
+	{
+		$_where = array('Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price);
+		return $return_array
+			? $this->get_many_related('Price', array($_where))
+			: $this->get_first_related('Price', array($_where));
+	}
+
+
+	/**
+	 * This returns ONLY the price modifiers for the ticket (i.e. no taxes or base price)
+	 *
+	 * @access public
+	 * @return EE_Price[]
+	 * @throws EE_Error
+	 */
+	public function price_modifiers()
+	{
+		$query_params = array(
+			0 => array(
+				'Price_Type.PBT_ID' => array(
+					'NOT IN',
+					array(EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax),
+				),
+			),
+		);
+		return $this->prices($query_params);
+	}
+
+
+	/**
+	 * Gets all the prices that combine to form the final price of this ticket
+	 *
+	 * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @return EE_Price[]|EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	public function prices($query_params = array())
+	{
+		return $this->get_many_related('Price', $query_params);
+	}
+
+
+	/**
+	 * Gets all the ticket applicabilities (ie, relations between datetimes and tickets)
+	 *
+	 * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @return EE_Datetime_Ticket|EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	public function datetime_tickets($query_params = array())
+	{
+		return $this->get_many_related('Datetime_Ticket', $query_params);
+	}
+
+
+	/**
+	 * Gets all the datetimes from the db ordered by DTT_order
+	 *
+	 * @param boolean $show_expired
+	 * @param boolean $show_deleted
+	 * @return EE_Datetime[]
+	 * @throws EE_Error
+	 */
+	public function datetimes_ordered($show_expired = true, $show_deleted = false)
+	{
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_ticket_ordered_by_DTT_order(
+			$this->ID(),
+			$show_expired,
+			$show_deleted
+		);
+	}
+
+
+	/**
+	 * Gets ID
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function ID()
+	{
+		return $this->get('TKT_ID');
+	}
+
+
+	/**
+	 * get the author of the ticket.
+	 *
+	 * @since 4.5.0
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function wp_user()
+	{
+		return $this->get('TKT_wp_user');
+	}
+
+
+	/**
+	 * Gets the template for the ticket
+	 *
+	 * @return EE_Ticket_Template|EE_Base_Class
+	 * @throws EE_Error
+	 */
+	public function template()
+	{
+		return $this->get_first_related('Ticket_Template');
+	}
+
+
+	/**
+	 * Simply returns an array of EE_Price objects that are taxes.
+	 *
+	 * @return EE_Price[]
+	 * @throws EE_Error
+	 */
+	public function get_ticket_taxes_for_admin()
+	{
+		return EE_Taxes::get_taxes_for_admin();
+	}
+
+
+	/**
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public function ticket_price()
+	{
+		return $this->get('TKT_price');
+	}
+
+
+	/**
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function pretty_price()
+	{
+		return $this->get_pretty('TKT_price');
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	public function is_free()
+	{
+		return $this->get_ticket_total_with_taxes() === (float) 0;
+	}
+
+
+	/**
+	 * get_ticket_total_with_taxes
+	 *
+	 * @param bool $no_cache
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public function get_ticket_total_with_taxes($no_cache = false)
+	{
+		if ($this->_ticket_total_with_taxes === null || $no_cache) {
+			$this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
+		}
+		return (float) $this->_ticket_total_with_taxes;
+	}
+
+
+	public function ensure_TKT_Price_correct()
+	{
+		$this->set('TKT_price', EE_Taxes::get_subtotal_for_admin($this));
+		$this->save();
+	}
+
+
+	/**
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public function get_ticket_subtotal()
+	{
+		return EE_Taxes::get_subtotal_for_admin($this);
+	}
+
+
+	/**
+	 * Returns the total taxes applied to this ticket
+	 *
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public function get_ticket_taxes_total_for_admin()
+	{
+		return EE_Taxes::get_total_taxes_for_admin($this);
+	}
+
+
+	/**
+	 * Sets name
+	 *
+	 * @param string $name
+	 * @throws EE_Error
+	 */
+	public function set_name($name)
+	{
+		$this->set('TKT_name', $name);
+	}
+
+
+	/**
+	 * Gets description
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function description()
+	{
+		return $this->get('TKT_description');
+	}
+
+
+	/**
+	 * Sets description
+	 *
+	 * @param string $description
+	 * @throws EE_Error
+	 */
+	public function set_description($description)
+	{
+		$this->set('TKT_description', $description);
+	}
+
+
+	/**
+	 * Gets start_date
+	 *
+	 * @param string $dt_frmt
+	 * @param string $tm_frmt
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function start_date($dt_frmt = '', $tm_frmt = '')
+	{
+		return $this->_get_datetime('TKT_start_date', $dt_frmt, $tm_frmt);
+	}
+
+
+	/**
+	 * Sets start_date
+	 *
+	 * @param string $start_date
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_start_date($start_date)
+	{
+		$this->_set_date_time('B', $start_date, 'TKT_start_date');
+	}
+
+
+	/**
+	 * Gets end_date
+	 *
+	 * @param string $dt_frmt
+	 * @param string $tm_frmt
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function end_date($dt_frmt = '', $tm_frmt = '')
+	{
+		return $this->_get_datetime('TKT_end_date', $dt_frmt, $tm_frmt);
+	}
+
+
+	/**
+	 * Sets end_date
+	 *
+	 * @param string $end_date
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_end_date($end_date)
+	{
+		$this->_set_date_time('B', $end_date, 'TKT_end_date');
+	}
+
+
+	/**
+	 * Sets sell until time
+	 *
+	 * @since 4.5.0
+	 * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
+	 * @throws EE_Error
+	 */
+	public function set_end_time($time)
+	{
+		$this->_set_time_for($time, 'TKT_end_date');
+	}
+
+
+	/**
+	 * Sets min
+	 *
+	 * @param int $min
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_min($min)
+	{
+		$this->set('TKT_min', $min);
+	}
+
+
+	/**
+	 * Gets max
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function max()
+	{
+		return $this->get('TKT_max');
+	}
+
+
+	/**
+	 * Sets max
+	 *
+	 * @param int $max
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_max($max)
+	{
+		$this->set('TKT_max', $max);
+	}
+
+
+	/**
+	 * Sets price
+	 *
+	 * @param float $price
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_price($price)
+	{
+		$this->set('TKT_price', $price);
+	}
+
+
+	/**
+	 * Gets sold
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function sold()
+	{
+		return $this->get_raw('TKT_sold');
+	}
+
+
+	/**
+	 * Sets sold
+	 *
+	 * @param int $sold
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_sold($sold)
+	{
+		// sold can not go below zero
+		$sold = max(0, $sold);
+		$this->set('TKT_sold', $sold);
+	}
+
+
+	/**
+	 * Increments sold by amount passed by $qty AND decrements the reserved count on both this ticket and its
+	 * associated datetimes.
+	 *
+	 * @since 4.9.80.p
+	 * @param int $qty
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function increaseSold($qty = 1)
+	{
+		$qty = absint($qty);
+		// increment sold and decrement reserved datetime quantities simultaneously
+		// don't worry about failures, because they must have already had a spot reserved
+		$this->increaseSoldForDatetimes($qty);
+		// Increment and decrement ticket quantities simultaneously
+		$success = $this->adjustNumericFieldsInDb(
+			[
+				'TKT_reserved' => $qty * -1,
+				'TKT_sold' => $qty
+			]
+		);
+		do_action(
+			'AHEE__EE_Ticket__increase_sold',
+			$this,
+			$qty,
+			$this->sold(),
+			$success
+		);
+		return $success;
+	}
+
+	/**
+	 * On each datetime related to this ticket, increases its sold count and decreases its reserved count by $qty.
+	 *
+	 * @since 4.9.80.p
+	 * @param int $qty positive or negative. Positive means to increase sold counts (and decrease reserved counts),
+	 *             Negative means to decreases old counts (and increase reserved counts).
+	 * @param EE_Datetime[] $datetimes
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function increaseSoldForDatetimes($qty, array $datetimes = [])
+	{
+		$datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
+		foreach ($datetimes as $datetime) {
+			$datetime->increaseSold($qty);
+		}
+	}
+
+
+
+	/**
+	 * Decrements (subtracts) sold by amount passed by $qty on both the ticket and its related datetimes directly in the
+	 * DB and then updates the model objects.
+	 * Does not affect the reserved counts.
+	 *
+	 * @since 4.9.80.p
+	 * @param int $qty
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function decreaseSold($qty = 1)
+	{
+		$qty = absint($qty);
+		$this->decreaseSoldForDatetimes($qty);
+		$success = $this->adjustNumericFieldsInDb(
+			[
+				'TKT_sold' => $qty * -1
+			]
+		);
+		do_action(
+			'AHEE__EE_Ticket__decrease_sold',
+			$this,
+			$qty,
+			$this->sold(),
+			$success
+		);
+		return $success;
+	}
+
+
+	/**
+	 * Decreases sold on related datetimes
+	 *
+	 * @since 4.9.80.p
+	 * @param int $qty
+	 * @param EE_Datetime[] $datetimes
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function decreaseSoldForDatetimes($qty = 1, array $datetimes = [])
+	{
+		$datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->decreaseSold($qty);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Gets qty of reserved tickets
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function reserved()
+	{
+		return $this->get_raw('TKT_reserved');
+	}
+
+
+	/**
+	 * Sets reserved
+	 *
+	 * @param int $reserved
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_reserved($reserved)
+	{
+		// reserved can not go below zero
+		$reserved = max(0, (int) $reserved);
+		$this->set('TKT_reserved', $reserved);
+	}
+
+
+	/**
+	 * Increments reserved by amount passed by $qty, and persists it immediately to the database.
+	 *
+	 * @since 4.9.80.p
+	 * @param int    $qty
+	 * @param string $source
+	 * @return bool whether we successfully reserved the ticket or not.
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function increaseReserved($qty = 1, $source = 'unknown')
+	{
+		$qty = absint($qty);
+		do_action(
+			'AHEE__EE_Ticket__increase_reserved__begin',
+			$this,
+			$qty,
+			$source
+		);
+		$this->add_extra_meta(EE_Ticket::META_KEY_TICKET_RESERVATIONS, "{$qty} from {$source}");
+		$success = false;
+		$datetimes_adjusted_successfully = $this->increaseReservedForDatetimes($qty);
+		if ($datetimes_adjusted_successfully) {
+			$success = $this->incrementFieldConditionallyInDb(
+				'TKT_reserved',
+				'TKT_sold',
+				'TKT_qty',
+				$qty
+			);
+			if (! $success) {
+				// The datetimes were successfully bumped, but not the
+				// ticket. So we need to manually rollback the datetimes.
+				$this->decreaseReservedForDatetimes($qty);
+			}
+		}
+		do_action(
+			'AHEE__EE_Ticket__increase_reserved',
+			$this,
+			$qty,
+			$this->reserved(),
+			$success
+		);
+		return $success;
+	}
+
+
+	/**
+	 * Increases reserved counts on related datetimes
+	 *
+	 * @since 4.9.80.p
+	 * @param int $qty
+	 * @param EE_Datetime[] $datetimes
+	 * @return boolean indicating success
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function increaseReservedForDatetimes($qty = 1, array $datetimes = [])
+	{
+		$datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
+		$datetimes_updated = [];
+		$limit_exceeded = false;
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					if ($datetime->increaseReserved($qty)) {
+						$datetimes_updated[] = $datetime;
+					} else {
+						$limit_exceeded = true;
+						break;
+					}
+				}
+			}
+			// If somewhere along the way we detected a datetime whose
+			// limit was exceeded, do a manual rollback.
+			if ($limit_exceeded) {
+				$this->decreaseReservedForDatetimes($qty, $datetimes_updated);
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * Decrements (subtracts) reserved by amount passed by $qty, and persists it immediately to the database.
+	 *
+	 * @since 4.9.80.p
+	 * @param int    $qty
+	 * @param bool   $adjust_datetimes
+	 * @param string $source
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function decreaseReserved($qty = 1, $adjust_datetimes = true, $source = 'unknown')
+	{
+		$qty = absint($qty);
+		$this->add_extra_meta(EE_Ticket::META_KEY_TICKET_RESERVATIONS, "-{$qty} from {$source}");
+		if ($adjust_datetimes) {
+			$this->decreaseReservedForDatetimes($qty);
+		}
+		$success = $this->adjustNumericFieldsInDb(
+			[
+				'TKT_reserved' => $qty * -1
+			]
+		);
+		do_action(
+			'AHEE__EE_Ticket__decrease_reserved',
+			$this,
+			$qty,
+			$this->reserved(),
+			$success
+		);
+		return $success;
+	}
+
+
+	/**
+	 * Decreases the reserved count on the specified datetimes.
+	 *
+	 * @since 4.9.80.p
+	 * @param int           $qty
+	 * @param EE_Datetime[] $datetimes
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function decreaseReservedForDatetimes($qty = 1, array $datetimes = [])
+	{
+		$datetimes = ! empty($datetimes) ? $datetimes : $this->datetimes();
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$datetime->decreaseReserved($qty);
+			}
+		}
+	}
+
+
+	/**
+	 * Gets ticket quantity
+	 *
+	 * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
+	 *                            therefore $context can be one of three values: '', 'reg_limit', or 'saleable'
+	 *                            '' (default) quantity is the actual db value for TKT_qty, unaffected by other objects
+	 *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
+	 *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
+	 *                            is therefore the truest measure of tickets that can be purchased at the moment
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function qty($context = '')
+	{
+		switch ($context) {
+			case 'reg_limit':
+				return $this->real_quantity_on_ticket();
+			case 'saleable':
+				return $this->real_quantity_on_ticket('saleable');
+			default:
+				return $this->get_raw('TKT_qty');
+		}
+	}
+
+
+	/**
+	 * Gets ticket quantity
+	 *
+	 * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
+	 *                            therefore $context can be one of two values: 'reg_limit', or 'saleable'
+	 *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
+	 *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
+	 *                            is therefore the truest measure of tickets that can be purchased at the moment
+	 * @param  int   $DTT_ID      the primary key for a particular datetime.
+	 *                            set to 0 for all related datetimes
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function real_quantity_on_ticket($context = 'reg_limit', $DTT_ID = 0)
+	{
+		$raw = $this->get_raw('TKT_qty');
+		// return immediately if it's zero
+		if ($raw === 0) {
+			return $raw;
+		}
+		// echo "\n\n<br />Ticket: " . $this->name() . '<br />';
+		// ensure qty doesn't exceed raw value for THIS ticket
+		$qty = min(EE_INF, $raw);
+		// echo "\n . qty: " . $qty . '<br />';
+		// calculate this ticket's total sales and reservations
+		$sold_and_reserved_for_this_ticket = $this->sold() + $this->reserved();
+		// echo "\n . sold: " . $this->sold() . '<br />';
+		// echo "\n . reserved: " . $this->reserved() . '<br />';
+		// echo "\n . sold_and_reserved_for_this_ticket: " . $sold_and_reserved_for_this_ticket . '<br />';
+		// first we need to calculate the maximum number of tickets available for the datetime
+		// do we want data for one datetime or all of them ?
+		$query_params = $DTT_ID ? array(array('DTT_ID' => $DTT_ID)) : array();
+		$datetimes = $this->datetimes($query_params);
+		if (is_array($datetimes) && ! empty($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->refresh_from_db();
+					// echo "\n . . datetime name: " . $datetime->name() . '<br />';
+					// echo "\n . . datetime ID: " . $datetime->ID() . '<br />';
+					// initialize with no restrictions for each datetime
+					// but adjust datetime qty based on datetime reg limit
+					$datetime_qty = min(EE_INF, $datetime->reg_limit());
+					// echo "\n . . . datetime reg_limit: " . $datetime->reg_limit() . '<br />';
+					// echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
+					// if we want the actual saleable amount, then we need to consider OTHER ticket sales
+					// and reservations for this datetime, that do NOT include sales and reservations
+					// for this ticket (so we add $this->sold() and $this->reserved() back in)
+					if ($context === 'saleable') {
+						$datetime_qty = max(
+							$datetime_qty - $datetime->sold_and_reserved() + $sold_and_reserved_for_this_ticket,
+							0
+						);
+						// echo "\n . . . datetime sold: " . $datetime->sold() . '<br />';
+						// echo "\n . . . datetime reserved: " . $datetime->reserved() . '<br />';
+						// echo "\n . . . datetime sold_and_reserved: " . $datetime->sold_and_reserved() . '<br />';
+						// echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
+						$datetime_qty = ! $datetime->sold_out() ? $datetime_qty : 0;
+						// echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
+					}
+					$qty = min($datetime_qty, $qty);
+					// echo "\n . . qty: " . $qty . '<br />';
+				}
+			}
+		}
+		// NOW that we know the  maximum number of tickets available for the datetime
+		// we can finally factor in the details for this specific ticket
+		if ($qty > 0 && $context === 'saleable') {
+			// and subtract the sales for THIS ticket
+			$qty = max($qty - $sold_and_reserved_for_this_ticket, 0);
+			// echo "\n . qty: " . $qty . '<br />';
+		}
+		// echo "\nFINAL QTY: " . $qty . "<br /><br />";
+		return $qty;
+	}
+
+
+	/**
+	 * Sets qty - IMPORTANT!!! Does NOT allow QTY to be set higher than the lowest reg limit of any related datetimes
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_qty($qty)
+	{
+		$datetimes = $this->datetimes();
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$qty = min($qty, $datetime->reg_limit());
+			}
+		}
+		$this->set('TKT_qty', $qty);
+	}
+
+
+	/**
+	 * Gets uses
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function uses()
+	{
+		return $this->get('TKT_uses');
+	}
+
+
+	/**
+	 * Sets uses
+	 *
+	 * @param int $uses
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_uses($uses)
+	{
+		$this->set('TKT_uses', $uses);
+	}
+
+
+	/**
+	 * returns whether ticket is required or not.
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function required()
+	{
+		return $this->get('TKT_required');
+	}
+
+
+	/**
+	 * sets the TKT_required property
+	 *
+	 * @param boolean $required
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_required($required)
+	{
+		$this->set('TKT_required', $required);
+	}
+
+
+	/**
+	 * Gets taxable
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function taxable()
+	{
+		return $this->get('TKT_taxable');
+	}
+
+
+	/**
+	 * Sets taxable
+	 *
+	 * @param boolean $taxable
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_taxable($taxable)
+	{
+		$this->set('TKT_taxable', $taxable);
+	}
+
+
+	/**
+	 * Gets is_default
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function is_default()
+	{
+		return $this->get('TKT_is_default');
+	}
+
+
+	/**
+	 * Sets is_default
+	 *
+	 * @param boolean $is_default
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_is_default($is_default)
+	{
+		$this->set('TKT_is_default', $is_default);
+	}
+
+
+	/**
+	 * Gets order
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function order()
+	{
+		return $this->get('TKT_order');
+	}
+
+
+	/**
+	 * Sets order
+	 *
+	 * @param int $order
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_order($order)
+	{
+		$this->set('TKT_order', $order);
+	}
+
+
+	/**
+	 * Gets row
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function row()
+	{
+		return $this->get('TKT_row');
+	}
+
+
+	/**
+	 * Sets row
+	 *
+	 * @param int $row
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_row($row)
+	{
+		$this->set('TKT_row', $row);
+	}
+
+
+	/**
+	 * Gets deleted
+	 *
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function deleted()
+	{
+		return $this->get('TKT_deleted');
+	}
+
+
+	/**
+	 * Sets deleted
+	 *
+	 * @param boolean $deleted
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_deleted($deleted)
+	{
+		$this->set('TKT_deleted', $deleted);
+	}
+
+
+	/**
+	 * Gets parent
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function parent_ID()
+	{
+		return $this->get('TKT_parent');
+	}
+
+
+	/**
+	 * Sets parent
+	 *
+	 * @param int $parent
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function set_parent_ID($parent)
+	{
+		$this->set('TKT_parent', $parent);
+	}
+
+
+	/**
+	 * Gets a string which is handy for showing in gateways etc that describes the ticket.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function name_and_info()
+	{
+		$times = array();
+		foreach ($this->datetimes() as $datetime) {
+			$times[] = $datetime->start_date_and_time();
+		}
+		return $this->name() . ' @ ' . implode(', ', $times) . ' for ' . $this->pretty_price();
+	}
+
+
+	/**
+	 * Gets name
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function name()
+	{
+		return $this->get('TKT_name');
+	}
+
+
+	/**
+	 * Gets price
+	 *
+	 * @return float
+	 * @throws EE_Error
+	 */
+	public function price()
+	{
+		return $this->get('TKT_price');
+	}
+
+
+	/**
+	 * Gets all the registrations for this ticket
+	 *
+	 * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @return EE_Registration[]|EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	public function registrations($query_params = array())
+	{
+		return $this->get_many_related('Registration', $query_params);
+	}
+
+
+	/**
+	 * Updates the TKT_sold attribute (and saves) based on the number of APPROVED registrations for this ticket.
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function update_tickets_sold()
+	{
+		$count_regs_for_this_ticket = $this->count_registrations(
+			array(
+				array(
+					'STS_ID'      => EEM_Registration::status_id_approved,
+					'REG_deleted' => 0,
+				),
+			)
+		);
+		$this->set_sold($count_regs_for_this_ticket);
+		$this->save();
+		return $count_regs_for_this_ticket;
+	}
+
+
+	/**
+	 * Counts the registrations for this ticket
+	 *
+	 * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @return int
+	 */
+	public function count_registrations($query_params = array())
+	{
+		return $this->count_related('Registration', $query_params);
+	}
+
+
+	/**
+	 * Implementation for EEI_Has_Icon interface method.
+	 *
+	 * @see EEI_Visual_Representation for comments
+	 * @return string
+	 */
+	public function get_icon()
+	{
+		return '<span class="dashicons dashicons-tickets-alt"></span>';
+	}
+
+
+	/**
+	 * Implementation of the EEI_Event_Relation interface method
+	 *
+	 * @see EEI_Event_Relation for comments
+	 * @return EE_Event
+	 * @throws EE_Error
+	 * @throws UnexpectedEntityException
+	 */
+	public function get_related_event()
+	{
+		// get one datetime to use for getting the event
+		$datetime = $this->first_datetime();
+		if (! $datetime instanceof \EE_Datetime) {
+			throw new UnexpectedEntityException(
+				$datetime,
+				'EE_Datetime',
+				sprintf(
+					__('The ticket (%s) is not associated with any valid datetimes.', 'event_espresso'),
+					$this->name()
+				)
+			);
+		}
+		$event = $datetime->event();
+		if (! $event instanceof \EE_Event) {
+			throw new UnexpectedEntityException(
+				$event,
+				'EE_Event',
+				sprintf(
+					__('The ticket (%s) is not associated with a valid event.', 'event_espresso'),
+					$this->name()
+				)
+			);
+		}
+		return $event;
+	}
+
+
+	/**
+	 * Implementation of the EEI_Event_Relation interface method
+	 *
+	 * @see EEI_Event_Relation for comments
+	 * @return string
+	 * @throws UnexpectedEntityException
+	 * @throws EE_Error
+	 */
+	public function get_event_name()
+	{
+		$event = $this->get_related_event();
+		return $event instanceof EE_Event ? $event->name() : '';
+	}
+
+
+	/**
+	 * Implementation of the EEI_Event_Relation interface method
+	 *
+	 * @see EEI_Event_Relation for comments
+	 * @return int
+	 * @throws UnexpectedEntityException
+	 * @throws EE_Error
+	 */
+	public function get_event_ID()
+	{
+		$event = $this->get_related_event();
+		return $event instanceof EE_Event ? $event->ID() : 0;
+	}
+
+
+	/**
+	 * This simply returns whether a ticket can be permanently deleted or not.
+	 * The criteria for determining this is whether the ticket has any related registrations.
+	 * If there are none then it can be permanently deleted.
+	 *
+	 * @return bool
+	 */
+	public function is_permanently_deleteable()
+	{
+		return $this->count_registrations() === 0;
+	}
+
+
+	/*******************************************************************
      ***********************  DEPRECATED METHODS  **********************
      *******************************************************************/
 
 
-    /**
-     * Increments sold by amount passed by $qty AND decrements the reserved count on both this ticket and its
-     * associated datetimes.
-     *
-     * @deprecated 4.9.80.p
-     * @param int $qty
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function increase_sold($qty = 1)
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::increaseSold() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        $this->increaseSold($qty);
-    }
-
-
-    /**
-     * On each datetime related to this ticket, increases its sold count and decreases its reserved count by $qty.
-     *
-     * @deprecated 4.9.80.p
-     * @param int $qty positive or negative. Positive means to increase sold counts (and decrease reserved counts),
-     *                 Negative means to decreases old counts (and increase reserved counts).
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _increase_sold_for_datetimes($qty)
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::increaseSoldForDatetimes() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        $this->increaseSoldForDatetimes($qty);
-    }
-
-
-    /**
-     * Decrements (subtracts) sold by amount passed by $qty on both the ticket and its related datetimes directly in the
-     * DB and then updates the model objects.
-     * Does not affect the reserved counts.
-     *
-     * @deprecated 4.9.80.p
-     * @param int $qty
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function decrease_sold($qty = 1)
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::decreaseSold() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        $this->decreaseSold($qty);
-    }
-
-
-    /**
-     * Decreases sold on related datetimes
-     *
-     * @deprecated 4.9.80.p
-     * @param int $qty
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _decrease_sold_for_datetimes($qty = 1)
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::decreaseSoldForDatetimes() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        $this->decreaseSoldForDatetimes($qty);
-    }
-
-
-    /**
-     * Increments reserved by amount passed by $qty, and persists it immediately to the database.
-     *
-     * @deprecated 4.9.80.p
-     * @param int    $qty
-     * @param string $source
-     * @return bool whether we successfully reserved the ticket or not.
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function increase_reserved($qty = 1, $source = 'unknown')
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::increaseReserved() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        return $this->increaseReserved($qty);
-    }
-
-
-    /**
-     * Increases sold on related datetimes
-     *
-     * @deprecated 4.9.80.p
-     * @param int $qty
-     * @return boolean indicating success
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _increase_reserved_for_datetimes($qty = 1)
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::increaseReservedForDatetimes() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        return $this->increaseReservedForDatetimes($qty);
-    }
-
-
-    /**
-     * Decrements (subtracts) reserved by amount passed by $qty, and persists it immediately to the database.
-     *
-     * @deprecated 4.9.80.p
-     * @param int    $qty
-     * @param bool   $adjust_datetimes
-     * @param string $source
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function decrease_reserved($qty = 1, $adjust_datetimes = true, $source = 'unknown')
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::decreaseReserved() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        $this->decreaseReserved($qty);
-    }
-
-
-    /**
-     * Decreases reserved on related datetimes
-     *
-     * @deprecated 4.9.80.p
-     * @param int $qty
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _decrease_reserved_for_datetimes($qty = 1)
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__('Please use EE_Ticket::decreaseReservedForDatetimes() instead', 'event_espresso'),
-            '4.9.80.p',
-            '5.0.0.p'
-        );
-        $this->decreaseReservedForDatetimes($qty);
-    }
+	/**
+	 * Increments sold by amount passed by $qty AND decrements the reserved count on both this ticket and its
+	 * associated datetimes.
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int $qty
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function increase_sold($qty = 1)
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::increaseSold() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		$this->increaseSold($qty);
+	}
+
+
+	/**
+	 * On each datetime related to this ticket, increases its sold count and decreases its reserved count by $qty.
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int $qty positive or negative. Positive means to increase sold counts (and decrease reserved counts),
+	 *                 Negative means to decreases old counts (and increase reserved counts).
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _increase_sold_for_datetimes($qty)
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::increaseSoldForDatetimes() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		$this->increaseSoldForDatetimes($qty);
+	}
+
+
+	/**
+	 * Decrements (subtracts) sold by amount passed by $qty on both the ticket and its related datetimes directly in the
+	 * DB and then updates the model objects.
+	 * Does not affect the reserved counts.
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int $qty
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function decrease_sold($qty = 1)
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::decreaseSold() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		$this->decreaseSold($qty);
+	}
+
+
+	/**
+	 * Decreases sold on related datetimes
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int $qty
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _decrease_sold_for_datetimes($qty = 1)
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::decreaseSoldForDatetimes() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		$this->decreaseSoldForDatetimes($qty);
+	}
+
+
+	/**
+	 * Increments reserved by amount passed by $qty, and persists it immediately to the database.
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int    $qty
+	 * @param string $source
+	 * @return bool whether we successfully reserved the ticket or not.
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function increase_reserved($qty = 1, $source = 'unknown')
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::increaseReserved() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		return $this->increaseReserved($qty);
+	}
+
+
+	/**
+	 * Increases sold on related datetimes
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int $qty
+	 * @return boolean indicating success
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _increase_reserved_for_datetimes($qty = 1)
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::increaseReservedForDatetimes() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		return $this->increaseReservedForDatetimes($qty);
+	}
+
+
+	/**
+	 * Decrements (subtracts) reserved by amount passed by $qty, and persists it immediately to the database.
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int    $qty
+	 * @param bool   $adjust_datetimes
+	 * @param string $source
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function decrease_reserved($qty = 1, $adjust_datetimes = true, $source = 'unknown')
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::decreaseReserved() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		$this->decreaseReserved($qty);
+	}
+
+
+	/**
+	 * Decreases reserved on related datetimes
+	 *
+	 * @deprecated 4.9.80.p
+	 * @param int $qty
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _decrease_reserved_for_datetimes($qty = 1)
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__('Please use EE_Ticket::decreaseReservedForDatetimes() instead', 'event_espresso'),
+			'4.9.80.p',
+			'5.0.0.p'
+		);
+		$this->decreaseReservedForDatetimes($qty);
+	}
 }