eventespresso / event-espresso-core

core/db_models/EEM_Question_Group.model.php

Indentation +136 added lines, -136 removed lines

@@ -9,148 +9,148 @@
  */
 class EEM_Question_Group extends EEM_Soft_Delete_Base
 {
-    /**
-     * personal information question group identifier
-     *
-     * @const int
-     */
-    const system_personal = 1;
+	/**
+	 * personal information question group identifier
+	 *
+	 * @const int
+	 */
+	const system_personal = 1;
 
-    /**
-     * address information question group identifier
-     *
-     * @const int
-     */
-    const system_address = 2;
+	/**
+	 * address information question group identifier
+	 *
+	 * @const int
+	 */
+	const system_address = 2;
 
-    /**
-     * private instance of the EEM_Question_Group object
-     *
-     * @var EEM_Question_Group
-     */
-    protected static $_instance;
+	/**
+	 * private instance of the EEM_Question_Group object
+	 *
+	 * @var EEM_Question_Group
+	 */
+	protected static $_instance;
 
 
-    /**
-     * EEM_Question_Group constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item = esc_html__('Question Group', 'event_espresso');
-        $this->plural_item   = esc_html__('Question Groups', 'event_espresso');
+	/**
+	 * EEM_Question_Group constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item = esc_html__('Question Group', 'event_espresso');
+		$this->plural_item   = esc_html__('Question Groups', 'event_espresso');
 
-        $this->_tables          = [
-            'Question_Group' => new EE_Primary_Table('esp_question_group', 'QSG_ID'),
-        ];
-        $this->_fields          = [
-            'Question_Group' => [
-                'QSG_ID'              => new EE_Primary_Key_Int_Field(
-                    'QSG_ID',
-                    esc_html__('Question Group ID', 'event_espresso')
-                ),
-                'QSG_deleted'         => new EE_Trashed_Flag_Field(
-                    'QSG_deleted',
-                    esc_html__('Flag indicating this question group was deleted', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'QSG_desc'            => new EE_Post_Content_Field(
-                    'QSG_desc',
-                    esc_html__('Description of Question Group', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'QSG_identifier'      => new EE_Plain_Text_Field(
-                    'QSG_identifier',
-                    esc_html__('Text ID for question Group', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'QSG_name'            => new EE_Plain_Text_Field(
-                    'QSG_name',
-                    esc_html__('Question Group Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'QSG_order'           => new EE_Integer_Field(
-                    'QSG_order',
-                    esc_html__('Order in which to show the question group', 'event_espresso'),
-                    true,
-                    0
-                ),
-                'QSG_show_group_desc' => new EE_Boolean_Field(
-                    'QSG_show_group_desc',
-                    esc_html__(
-                        'Flag indicating whether to show the group\s description on the registration page',
-                        'event_espresso'
-                    ),
-                    false,
-                    false
-                ),
-                'QSG_show_group_name' => new EE_Boolean_Field(
-                    'QSG_show_group_name',
-                    esc_html__(
-                        'Flag indicating whether to show the group\'s name on the registration page',
-                        'event_espresso'
-                    ),
-                    false,
-                    true
-                ),
-                'QSG_system'          => new EE_Integer_Field(
-                    'QSG_system',
-                    esc_html__(
-                        'Indicate IF this is a system group and if it is what system group it corresponds to.',
-                        'event_espresso'
-                    ),
-                    false,
-                    0
-                ),
-                'QSG_wp_user'         => new EE_WP_User_Field(
-                    'QSG_wp_user',
-                    esc_html__('Question Group Creator ID', 'event_espresso'),
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Event'                => new EE_HABTM_Relation('Event_Question_Group'),
-            'Event_Question_Group' => new EE_Has_Many_Relation(),
-            'Question'             => new EE_HABTM_Relation('Question_Group_Question'),
-            'WP_User'              => new EE_Belongs_To_Relation(),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
-            new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
-            new EE_Restriction_Generator_Reg_Form('QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
-            new EE_Restriction_Generator_Reg_Form('QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
-            new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_tables          = [
+			'Question_Group' => new EE_Primary_Table('esp_question_group', 'QSG_ID'),
+		];
+		$this->_fields          = [
+			'Question_Group' => [
+				'QSG_ID'              => new EE_Primary_Key_Int_Field(
+					'QSG_ID',
+					esc_html__('Question Group ID', 'event_espresso')
+				),
+				'QSG_deleted'         => new EE_Trashed_Flag_Field(
+					'QSG_deleted',
+					esc_html__('Flag indicating this question group was deleted', 'event_espresso'),
+					false,
+					false
+				),
+				'QSG_desc'            => new EE_Post_Content_Field(
+					'QSG_desc',
+					esc_html__('Description of Question Group', 'event_espresso'),
+					true,
+					''
+				),
+				'QSG_identifier'      => new EE_Plain_Text_Field(
+					'QSG_identifier',
+					esc_html__('Text ID for question Group', 'event_espresso'),
+					false,
+					''
+				),
+				'QSG_name'            => new EE_Plain_Text_Field(
+					'QSG_name',
+					esc_html__('Question Group Name', 'event_espresso'),
+					false,
+					''
+				),
+				'QSG_order'           => new EE_Integer_Field(
+					'QSG_order',
+					esc_html__('Order in which to show the question group', 'event_espresso'),
+					true,
+					0
+				),
+				'QSG_show_group_desc' => new EE_Boolean_Field(
+					'QSG_show_group_desc',
+					esc_html__(
+						'Flag indicating whether to show the group\s description on the registration page',
+						'event_espresso'
+					),
+					false,
+					false
+				),
+				'QSG_show_group_name' => new EE_Boolean_Field(
+					'QSG_show_group_name',
+					esc_html__(
+						'Flag indicating whether to show the group\'s name on the registration page',
+						'event_espresso'
+					),
+					false,
+					true
+				),
+				'QSG_system'          => new EE_Integer_Field(
+					'QSG_system',
+					esc_html__(
+						'Indicate IF this is a system group and if it is what system group it corresponds to.',
+						'event_espresso'
+					),
+					false,
+					0
+				),
+				'QSG_wp_user'         => new EE_WP_User_Field(
+					'QSG_wp_user',
+					esc_html__('Question Group Creator ID', 'event_espresso'),
+					false
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Event'                => new EE_HABTM_Relation('Event_Question_Group'),
+			'Event_Question_Group' => new EE_Has_Many_Relation(),
+			'Question'             => new EE_HABTM_Relation('Question_Group_Question'),
+			'WP_User'              => new EE_Belongs_To_Relation(),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
+			new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
+			new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
+			new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
+			new EE_Restriction_Generator_Reg_Form('QSG_system');
 
-        parent::__construct($timezone);
-    }
+		parent::__construct($timezone);
+	}
 
 
-    /**
-     * searches the db for the question group with the latest question order and returns that value.
-     *
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_latest_question_group_order(): int
-    {
-        $max = $this->_get_all_wpdb_results(
-            [],
-            ARRAY_A,
-            [
-                'max_order' => ["MAX(QSG_order)", "%d"],
-            ]
-        );
-        return $max[0]['max_order'];
-    }
+	/**
+	 * searches the db for the question group with the latest question order and returns that value.
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_latest_question_group_order(): int
+	{
+		$max = $this->_get_all_wpdb_results(
+			[],
+			ARRAY_A,
+			[
+				'max_order' => ["MAX(QSG_order)", "%d"],
+			]
+		);
+		return $max[0]['max_order'];
+	}
 }

core/db_models/EEM_Registration_Payment.model.php

Indentation +51 added lines, -51 removed lines

@@ -14,62 +14,62 @@
 class EEM_Registration_Payment extends EEM_Base
 {
 
-    /**
-     * @var EEM_Registration_Payment
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Registration_Payment
+	 */
+	protected static $_instance;
 
 
-    /**
-     * EEM_Registration_Payment constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
+	/**
+	 * EEM_Registration_Payment constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
 
-        $this->singular_item = esc_html__('Registration Payment', 'event_espresso');
-        $this->plural_item   = esc_html__('Registration Payments', 'event_espresso');
+		$this->singular_item = esc_html__('Registration Payment', 'event_espresso');
+		$this->plural_item   = esc_html__('Registration Payments', 'event_espresso');
 
-        $this->_tables = [
-            'Registration_Payment' => new EE_Primary_Table('esp_registration_payment', 'RPY_ID'),
-        ];
+		$this->_tables = [
+			'Registration_Payment' => new EE_Primary_Table('esp_registration_payment', 'RPY_ID'),
+		];
 
-        $this->_fields = [
-            'Registration_Payment' => [
-                'RPY_ID'     => new EE_Primary_Key_Int_Field(
-                    'RPY_ID',
-                    esc_html__('Registration Payment ID', 'event_espresso')
-                ),
-                'REG_ID'     => new EE_Foreign_Key_Int_Field(
-                    'REG_ID',
-                    esc_html__('Registration ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Registration'
-                ),
-                'PAY_ID'     => new EE_Foreign_Key_Int_Field(
-                    'PAY_ID',
-                    esc_html__('Payment ID', 'event_espresso'),
-                    true,
-                    null,
-                    'Payment'
-                ),
-                'RPY_amount' => new EE_Money_Field(
-                    'RPY_amount',
-                    esc_html__('Amount attributed to the registration', 'event_espresso'),
-                    false,
-                    0
-                ),
-            ],
-        ];
+		$this->_fields = [
+			'Registration_Payment' => [
+				'RPY_ID'     => new EE_Primary_Key_Int_Field(
+					'RPY_ID',
+					esc_html__('Registration Payment ID', 'event_espresso')
+				),
+				'REG_ID'     => new EE_Foreign_Key_Int_Field(
+					'REG_ID',
+					esc_html__('Registration ID', 'event_espresso'),
+					false,
+					0,
+					'Registration'
+				),
+				'PAY_ID'     => new EE_Foreign_Key_Int_Field(
+					'PAY_ID',
+					esc_html__('Payment ID', 'event_espresso'),
+					true,
+					null,
+					'Payment'
+				),
+				'RPY_amount' => new EE_Money_Field(
+					'RPY_amount',
+					esc_html__('Amount attributed to the registration', 'event_espresso'),
+					false,
+					0
+				),
+			],
+		];
 
-        $this->_model_relations = [
-            'Registration' => new EE_Belongs_To_Relation(),
-            'Payment'      => new EE_Belongs_To_Relation(),
-        ];
+		$this->_model_relations = [
+			'Registration' => new EE_Belongs_To_Relation(),
+			'Payment'      => new EE_Belongs_To_Relation(),
+		];
 
-        parent::__construct($timezone);
-    }
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_Extra_Meta.model.php

Indentation +63 added lines, -63 removed lines

@@ -15,70 +15,70 @@
 class EEM_Extra_Meta extends EEM_Base
 {
 
-    /**
-     * @var EEM_Extra_Meta
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Extra_Meta
+	 */
+	protected static $_instance;
 
 
-    /**
-     * EEM_Extra_Meta constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item       = esc_html__('Extra Meta', 'event_espresso');
-        $this->plural_item         = esc_html__('Extra Metas', 'event_espresso');
-        $this->_tables             = [
-            'Extra_Meta' => new EE_Primary_Table('esp_extra_meta', 'EXM_ID'),
-        ];
-        $models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
-        $this->_fields             = [
-            'Extra_Meta' => [
-                'EXM_ID'    => new EE_Primary_Key_Int_Field(
-                    'EXM_ID',
-                    esc_html__("Extra Meta ID", "event_espresso")
-                ),
-                'OBJ_ID'    => new EE_Foreign_Key_Int_Field(
-                    'OBJ_ID',
-                    esc_html__("Primary Key of Attached Thing", "event_espresso"),
-                    false,
-                    0,
-                    $models_this_can_attach_to
-                ),
-                'EXM_type'  => new EE_Any_Foreign_Model_Name_Field(
-                    'EXM_type',
-                    esc_html__("Model of Attached Thing", "event_espresso"),
-                    false,
-                    'Transaction',
-                    $models_this_can_attach_to
-                ),
-                'EXM_key'   => new EE_Plain_Text_Field(
-                    'EXM_key',
-                    esc_html__("Meta Key", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'EXM_value' => new EE_Maybe_Serialized_Text_Field(
-                    'EXM_value',
-                    esc_html__("Meta Value", "event_espresso"),
-                    true
-                ),
+	/**
+	 * EEM_Extra_Meta constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item       = esc_html__('Extra Meta', 'event_espresso');
+		$this->plural_item         = esc_html__('Extra Metas', 'event_espresso');
+		$this->_tables             = [
+			'Extra_Meta' => new EE_Primary_Table('esp_extra_meta', 'EXM_ID'),
+		];
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
+		$this->_fields             = [
+			'Extra_Meta' => [
+				'EXM_ID'    => new EE_Primary_Key_Int_Field(
+					'EXM_ID',
+					esc_html__("Extra Meta ID", "event_espresso")
+				),
+				'OBJ_ID'    => new EE_Foreign_Key_Int_Field(
+					'OBJ_ID',
+					esc_html__("Primary Key of Attached Thing", "event_espresso"),
+					false,
+					0,
+					$models_this_can_attach_to
+				),
+				'EXM_type'  => new EE_Any_Foreign_Model_Name_Field(
+					'EXM_type',
+					esc_html__("Model of Attached Thing", "event_espresso"),
+					false,
+					'Transaction',
+					$models_this_can_attach_to
+				),
+				'EXM_key'   => new EE_Plain_Text_Field(
+					'EXM_key',
+					esc_html__("Meta Key", "event_espresso"),
+					false,
+					''
+				),
+				'EXM_value' => new EE_Maybe_Serialized_Text_Field(
+					'EXM_value',
+					esc_html__("Meta Value", "event_espresso"),
+					true
+				),
 
-            ],
-        ];
-        $this->_model_relations    = [];
-        foreach ($models_this_can_attach_to as $model) {
-            $this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
-        }
-        foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
-            $this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta(
-                'EXM_key',
-                'EXM_value'
-            );
-        }
-        parent::__construct($timezone);
-    }
+			],
+		];
+		$this->_model_relations    = [];
+		foreach ($models_this_can_attach_to as $model) {
+			$this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
+		}
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta(
+				'EXM_key',
+				'EXM_value'
+			);
+		}
+		parent::__construct($timezone);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -69,12 +69,12 @@
 
             ],
         ];
-        $this->_model_relations    = [];
+        $this->_model_relations = [];
         foreach ($models_this_can_attach_to as $model) {
-            $this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
+            $this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
         }
         foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
-            $this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta(
+            $this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta(
                 'EXM_key',
                 'EXM_value'
             );

core/db_models/EEM_Checkin.model.php

Indentation +62 added lines, -62 removed lines

@@ -12,69 +12,69 @@
 class EEM_Checkin extends EEM_Base
 {
 
-    // private instance of the EEM_Checkin object
-    protected static $_instance;
+	// private instance of the EEM_Checkin object
+	protected static $_instance;
 
 
-    /**
-     * private constructor to prevent direct creation
-     *
-     * @param string|null $timezone string representing the timezone we want to set for returned Date Time Strings
-     *                              (and any incoming timezone data that gets saved).
-     *                              Note this just sends the timezone info to the date time model field objects.
-     *                              will use 'timezone_string' wp option as default
-     * @return void
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item = esc_html__('Check-In', 'event_espresso');
-        $this->plural_item   = esc_html__('Check-Ins', 'event_espresso');
+	/**
+	 * private constructor to prevent direct creation
+	 *
+	 * @param string|null $timezone string representing the timezone we want to set for returned Date Time Strings
+	 *                              (and any incoming timezone data that gets saved).
+	 *                              Note this just sends the timezone info to the date time model field objects.
+	 *                              will use 'timezone_string' wp option as default
+	 * @return void
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item = esc_html__('Check-In', 'event_espresso');
+		$this->plural_item   = esc_html__('Check-Ins', 'event_espresso');
 
-        $this->_tables                 = [
-            'Checkin' => new EE_Primary_Table('esp_checkin', 'CHK_ID'),
-        ];
-        $this->_fields                 = [
-            'Checkin' => [
-                'CHK_ID'        => new EE_Primary_Key_Int_Field(
-                    'CHK_ID',
-                    esc_html__('Check-in ID', 'event_espresso')
-                ),
-                'REG_ID'        => new EE_Foreign_Key_Int_Field(
-                    'REG_ID',
-                    esc_html__('Registration Id', 'event_espresso'),
-                    false,
-                    0,
-                    'Registration'
-                ),
-                'DTT_ID'        => new EE_Foreign_Key_Int_Field(
-                    'DTT_ID',
-                    esc_html__('Datetime Id', 'event_espresso'),
-                    false,
-                    0,
-                    'Datetime'
-                ),
-                'CHK_in'        => new EE_Boolean_Field(
-                    'CHK_in',
-                    esc_html__('Whether a person has checked in or checked out', 'event_espresso'),
-                    false,
-                    true
-                ),
-                'CHK_timestamp' => new EE_Datetime_Field(
-                    'CHK_timestamp',
-                    esc_html__('When the row was modified', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-            ],
-        ];
-        $this->_model_relations        = [
-            'Registration' => new EE_Belongs_To_Relation(),
-            'Datetime'     => new EE_Belongs_To_Relation(),
-        ];
-        $this->_model_chain_to_wp_user = 'Registration.Event';
-        parent::__construct($timezone);
-    }
+		$this->_tables                 = [
+			'Checkin' => new EE_Primary_Table('esp_checkin', 'CHK_ID'),
+		];
+		$this->_fields                 = [
+			'Checkin' => [
+				'CHK_ID'        => new EE_Primary_Key_Int_Field(
+					'CHK_ID',
+					esc_html__('Check-in ID', 'event_espresso')
+				),
+				'REG_ID'        => new EE_Foreign_Key_Int_Field(
+					'REG_ID',
+					esc_html__('Registration Id', 'event_espresso'),
+					false,
+					0,
+					'Registration'
+				),
+				'DTT_ID'        => new EE_Foreign_Key_Int_Field(
+					'DTT_ID',
+					esc_html__('Datetime Id', 'event_espresso'),
+					false,
+					0,
+					'Datetime'
+				),
+				'CHK_in'        => new EE_Boolean_Field(
+					'CHK_in',
+					esc_html__('Whether a person has checked in or checked out', 'event_espresso'),
+					false,
+					true
+				),
+				'CHK_timestamp' => new EE_Datetime_Field(
+					'CHK_timestamp',
+					esc_html__('When the row was modified', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+			],
+		];
+		$this->_model_relations        = [
+			'Registration' => new EE_Belongs_To_Relation(),
+			'Datetime'     => new EE_Belongs_To_Relation(),
+		];
+		$this->_model_chain_to_wp_user = 'Registration.Event';
+		parent::__construct($timezone);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
                 ),
             ],
         ];
-        $this->_model_relations        = [
+        $this->_model_relations = [
             'Registration' => new EE_Belongs_To_Relation(),
             'Datetime'     => new EE_Belongs_To_Relation(),
         ];

core/db_models/EEM_Payment.model.php

Indentation +326 added lines, -326 removed lines

@@ -12,330 +12,330 @@
 class EEM_Payment extends EEM_Base implements EEMI_Payment
 {
 
-    /**
-     * @var EEM_Payment
-     */
-    protected static $_instance;
-
-
-    /**
-     * Status id in esp_status table that represents an approved payment
-     */
-    const status_id_approved = 'PAP';
-
-
-    /**
-     * Status id in esp_status table that represents a pending payment
-     */
-    const status_id_pending = 'PPN';
-
-
-    /**
-     * Status id in esp_status table that represents a cancelled payment (eg, the
-     * user went to PayPal, but on the paypal site decided to cancel the payment)
-     */
-    const status_id_cancelled = 'PCN';
-
-
-    /**
-     * Status id in esp_status table that represents a payment that was declined by
-     * the gateway. (eg, the user's card had no funds, or it was a fraudulent card)
-     */
-    const status_id_declined = 'PDC';
-
-
-    /**
-     * Status id in esp_status table that represents a payment that failed for technical reasons.
-     * (Eg, there was some error in communicating with the payment gateway.)
-     */
-    const status_id_failed = 'PFL';
-
-
-    /**
-     * private constructor to prevent direct creation
-     *
-     * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
-     *                         incoming timezone data that gets saved).  Note this just sends the timezone info to the
-     *                         date time model field objects.  Default is NULL (and will be assumed using the set
-     *                         timezone in the 'timezone_string' wp option)
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-
-        $this->singular_item = esc_html__('Payment', 'event_espresso');
-        $this->plural_item   = esc_html__('Payments', 'event_espresso');
-
-        $this->_tables                 = [
-            'Payment' => new EE_Primary_Table('esp_payment', 'PAY_ID'),
-        ];
-        $this->_fields                 = [
-            'Payment' => [
-                'PAY_ID'               => new EE_Primary_Key_Int_Field(
-                    'PAY_ID',
-                    esc_html__('Payment ID', 'event_espresso')
-                ),
-                'TXN_ID'               => new EE_Foreign_Key_Int_Field(
-                    'TXN_ID',
-                    esc_html__('Transaction ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Transaction'
-                ),
-                'STS_ID'               => new EE_Foreign_Key_String_Field(
-                    'STS_ID',
-                    esc_html__('Status ID', 'event_espresso'),
-                    false,
-                    EEM_Payment::status_id_failed,
-                    'Status'
-                ),
-                'PAY_timestamp'        => new EE_Datetime_Field(
-                    'PAY_timestamp',
-                    esc_html__('Timestamp of when payment was attempted', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-                'PAY_source'           => new EE_All_Caps_Text_Field(
-                    'PAY_source',
-                    esc_html__('User-friendly description of payment', 'event_espresso'),
-                    false,
-                    'CART'
-                ),
-                'PAY_amount'           => new EE_Money_Field(
-                    'PAY_amount',
-                    esc_html__('Amount Payment should be for', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'PMD_ID'               => new EE_Foreign_Key_Int_Field(
-                    'PMD_ID',
-                    esc_html__("Payment Method ID", 'event_espresso'),
-                    false,
-                    null,
-                    'Payment_Method'
-                ),
-                'PAY_gateway_response' => new EE_Plain_Text_Field(
-                    'PAY_gateway_response',
-                    esc_html__('Response from Gateway about the payment', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'PAY_txn_id_chq_nmbr'  => new EE_Plain_Text_Field(
-                    'PAY_txn_id_chq_nmbr',
-                    esc_html__('Gateway Transaction ID or Cheque Number', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'PAY_po_number'        => new EE_Plain_Text_Field(
-                    'PAY_po_number',
-                    esc_html__('Purchase or Sales Number', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'PAY_extra_accntng'    => new EE_Simple_HTML_Field(
-                    'PAY_extra_accntng',
-                    esc_html__('Extra Account Info', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'PAY_details'          => new EE_Serialized_Text_Field(
-                    'PAY_details',
-                    esc_html__('Full Gateway response about payment', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'PAY_redirect_url'     => new EE_Plain_Text_Field(
-                    'PAY_redirect_url',
-                    esc_html__("Redirect URL", 'event_espresso'),
-                    true
-                ),
-                'PAY_redirect_args'    => new EE_Serialized_Text_Field(
-                    'PAY_redirect_args',
-                    esc_html__("Key-Value POST vars to send along with redirect", 'event_espresso'),
-                    true
-                ),
-            ],
-        ];
-        $this->_model_relations        = [
-            'Transaction'          => new EE_Belongs_To_Relation(),
-            'Status'               => new EE_Belongs_To_Relation(),
-            'Payment_Method'       => new EE_Belongs_To_Relation(),
-            'Registration_Payment' => new EE_Has_Many_Relation(),
-            'Registration'         => new EE_HABTM_Relation('Registration_Payment'),
-        ];
-        $this->_model_chain_to_wp_user = 'Payment_Method';
-        $this->_caps_slug              = 'transactions';
-        parent::__construct($timezone);
-    }
-
-
-    /**
-     * Gets the payment by the gateway server's unique ID. Eg, the unique ID PayPal assigned
-     * to the payment. This is handy for verifying an IPN hasn't already been processed.
-     *
-     * @param int|string $PAY_txn_id_chq_nmbr
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_payment_by_txn_id_chq_nmbr($PAY_txn_id_chq_nmbr): EE_Payment
-    {
-        return $this->get_one([['PAY_txn_id_chq_nmbr' => $PAY_txn_id_chq_nmbr]]);
-    }
-
-
-    /**
-     *       retrieve  all payments from db for a particular transaction, optionally with
-     *      a particular status
-     *
-     * @param int $TXN_ID
-     * @param string $status_of_payment   one of EEM_Payment::status_id_*, like 'PAP','PCN',etc. If none is provided,
-     *                                  gets payments with any status
-     * @return EE_Payment[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_payments_for_transaction(int $TXN_ID, string $status_of_payment = ''): array
-    {
-        // all payments for a TXN ordered chronologically
-        $query_params = [['TXN_ID' => $TXN_ID], 'order_by' => ['PAY_timestamp' => 'ASC']];
-        // if provided with a status, search specifically for that status. Otherwise get them all
-        if ($status_of_payment) {
-            $query_params[0]['STS_ID'] = $status_of_payment;
-        }
-        // retrieve payments
-        return $this->get_all($query_params);
-    }
-
-
-    /**
-     * Only gets payments which have been approved
-     *
-     * @param int $TXN_ID
-     * @return EE_Payment[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_approved_payments_for_transaction(int $TXN_ID = 0): array
-    {
-        return $this->get_payments_for_transaction($TXN_ID, EEM_Payment::status_id_approved);
-    }
-
-
-    /**
-     * retrieve  all payments from db between two dates,
-     *
-     * @param string $start_date        incoming start date. If empty the beginning of today is used.
-     * @param string $end_date          incoming end date. If empty the end of today is used.
-     * @param string $format            If you include $start_date or $end_date then you must include the format string
-     *                                  for the format your date is in.
-     * @param string $timezone          If your range is in a different timezone then the current setting on this
-     *                                  WordPress install, then include it here.
-     * @return EE_Payment[]
-     * @throws ReflectionException
-     *
-     * @throws EE_Error
-     */
-    public function get_payments_made_between_dates(
-        string $start_date = '',
-        string $end_date = '',
-        string $format = '',
-        string $timezone = ''
-    ): array {
-        $timezone = empty($timezone) ? EEH_DTT_Helper::get_timezone() : $timezone;
-        // if $start_date or $end date, verify $format is included.
-        if ((! empty($start_date) || ! empty($end_date)) && empty($format)) {
-            throw new EE_Error(__('You included a start date and/or a end date for this method but did not include a format string.  The format string is needed for setting up the query',
-                                  'event_espresso'));
-        }
-        $now = new DateTime('now');
-        // setup timezone objects once
-        $modelDateTimeZone  = new DateTimeZone($this->_timezone);
-        $passedDateTimeZone = new DateTimeZone($timezone);
-        // setup start date
-        $start_date = ! empty($start_date) ? date_create_from_format($format, $start_date, $passedDateTimeZone) : $now;
-        EEH_DTT_Helper::setTimezone($start_date, $modelDateTimeZone);
-        $start_date = $start_date->format('Y-m-d') . ' 00:00:00';
-        $start_date = strtotime($start_date);
-        // setup end date
-        $end_date = ! empty($end_date) ? date_create_from_format($format, $end_date, $passedDateTimeZone) : $now;
-        EEH_DTT_Helper::setTimezone($end_date, $modelDateTimeZone);
-        $end_date = $end_date->format('Y-m-d') . ' 23:59:59';
-        $end_date = strtotime($end_date);
-
-        // make sure our start date is the lowest value and vice versa
-        $start = min($start_date, $end_date);
-        $end   = max($start_date, $end_date);
-
-        // yes we generated the date and time string in utc but we WANT this start date and time used in the set timezone on the model.
-        $start_date = $this->convert_datetime_for_query('PAY_timestamp',
-                                                        date('Y-m-d', $start) . ' 00:00:00',
-                                                        'Y-m-d H:i:s',
-                                                        $this->get_timezone());
-        $end_date   = $this->convert_datetime_for_query('PAY_timestamp',
-                                                        date('Y-m-d', $end) . ' 23:59:59',
-                                                        'Y-m-d H:i:s',
-                                                        $this->get_timezone());
-
-        return $this->get_all([['PAY_timestamp' => ['>=', $start_date], 'PAY_timestamp*' => ['<=', $end_date]]]);
-    }
-
-    /**
-     * methods for EEMI_Payment
-     */
-    /**
-     * returns a string for the approved status
-     *
-     * @return  string
-     */
-    public function approved_status(): string
-    {
-        return self::status_id_approved;
-    }
-
-
-    /**
-     * returns a string for the pending status
-     *
-     * @return  string
-     */
-    public function pending_status(): string
-    {
-        return self::status_id_pending;
-    }
-
-
-    /**
-     * returns a string for the cancelled status
-     *
-     * @return  string
-     */
-    public function cancelled_status(): string
-    {
-        return self::status_id_cancelled;
-    }
-
-
-    /**
-     * returns a string for the failed status
-     *
-     * @return  string
-     */
-    public function failed_status(): string
-    {
-        return self::status_id_failed;
-    }
-
-
-    /**
-     * returns a string for the declined status
-     *
-     * @return  string
-     */
-    public function declined_status(): string
-    {
-        return self::status_id_declined;
-    }
+	/**
+	 * @var EEM_Payment
+	 */
+	protected static $_instance;
+
+
+	/**
+	 * Status id in esp_status table that represents an approved payment
+	 */
+	const status_id_approved = 'PAP';
+
+
+	/**
+	 * Status id in esp_status table that represents a pending payment
+	 */
+	const status_id_pending = 'PPN';
+
+
+	/**
+	 * Status id in esp_status table that represents a cancelled payment (eg, the
+	 * user went to PayPal, but on the paypal site decided to cancel the payment)
+	 */
+	const status_id_cancelled = 'PCN';
+
+
+	/**
+	 * Status id in esp_status table that represents a payment that was declined by
+	 * the gateway. (eg, the user's card had no funds, or it was a fraudulent card)
+	 */
+	const status_id_declined = 'PDC';
+
+
+	/**
+	 * Status id in esp_status table that represents a payment that failed for technical reasons.
+	 * (Eg, there was some error in communicating with the payment gateway.)
+	 */
+	const status_id_failed = 'PFL';
+
+
+	/**
+	 * private constructor to prevent direct creation
+	 *
+	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
+	 *                         incoming timezone data that gets saved).  Note this just sends the timezone info to the
+	 *                         date time model field objects.  Default is NULL (and will be assumed using the set
+	 *                         timezone in the 'timezone_string' wp option)
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+
+		$this->singular_item = esc_html__('Payment', 'event_espresso');
+		$this->plural_item   = esc_html__('Payments', 'event_espresso');
+
+		$this->_tables                 = [
+			'Payment' => new EE_Primary_Table('esp_payment', 'PAY_ID'),
+		];
+		$this->_fields                 = [
+			'Payment' => [
+				'PAY_ID'               => new EE_Primary_Key_Int_Field(
+					'PAY_ID',
+					esc_html__('Payment ID', 'event_espresso')
+				),
+				'TXN_ID'               => new EE_Foreign_Key_Int_Field(
+					'TXN_ID',
+					esc_html__('Transaction ID', 'event_espresso'),
+					false,
+					0,
+					'Transaction'
+				),
+				'STS_ID'               => new EE_Foreign_Key_String_Field(
+					'STS_ID',
+					esc_html__('Status ID', 'event_espresso'),
+					false,
+					EEM_Payment::status_id_failed,
+					'Status'
+				),
+				'PAY_timestamp'        => new EE_Datetime_Field(
+					'PAY_timestamp',
+					esc_html__('Timestamp of when payment was attempted', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+				'PAY_source'           => new EE_All_Caps_Text_Field(
+					'PAY_source',
+					esc_html__('User-friendly description of payment', 'event_espresso'),
+					false,
+					'CART'
+				),
+				'PAY_amount'           => new EE_Money_Field(
+					'PAY_amount',
+					esc_html__('Amount Payment should be for', 'event_espresso'),
+					false,
+					0
+				),
+				'PMD_ID'               => new EE_Foreign_Key_Int_Field(
+					'PMD_ID',
+					esc_html__("Payment Method ID", 'event_espresso'),
+					false,
+					null,
+					'Payment_Method'
+				),
+				'PAY_gateway_response' => new EE_Plain_Text_Field(
+					'PAY_gateway_response',
+					esc_html__('Response from Gateway about the payment', 'event_espresso'),
+					false,
+					''
+				),
+				'PAY_txn_id_chq_nmbr'  => new EE_Plain_Text_Field(
+					'PAY_txn_id_chq_nmbr',
+					esc_html__('Gateway Transaction ID or Cheque Number', 'event_espresso'),
+					true,
+					''
+				),
+				'PAY_po_number'        => new EE_Plain_Text_Field(
+					'PAY_po_number',
+					esc_html__('Purchase or Sales Number', 'event_espresso'),
+					true,
+					''
+				),
+				'PAY_extra_accntng'    => new EE_Simple_HTML_Field(
+					'PAY_extra_accntng',
+					esc_html__('Extra Account Info', 'event_espresso'),
+					true,
+					''
+				),
+				'PAY_details'          => new EE_Serialized_Text_Field(
+					'PAY_details',
+					esc_html__('Full Gateway response about payment', 'event_espresso'),
+					true,
+					''
+				),
+				'PAY_redirect_url'     => new EE_Plain_Text_Field(
+					'PAY_redirect_url',
+					esc_html__("Redirect URL", 'event_espresso'),
+					true
+				),
+				'PAY_redirect_args'    => new EE_Serialized_Text_Field(
+					'PAY_redirect_args',
+					esc_html__("Key-Value POST vars to send along with redirect", 'event_espresso'),
+					true
+				),
+			],
+		];
+		$this->_model_relations        = [
+			'Transaction'          => new EE_Belongs_To_Relation(),
+			'Status'               => new EE_Belongs_To_Relation(),
+			'Payment_Method'       => new EE_Belongs_To_Relation(),
+			'Registration_Payment' => new EE_Has_Many_Relation(),
+			'Registration'         => new EE_HABTM_Relation('Registration_Payment'),
+		];
+		$this->_model_chain_to_wp_user = 'Payment_Method';
+		$this->_caps_slug              = 'transactions';
+		parent::__construct($timezone);
+	}
+
+
+	/**
+	 * Gets the payment by the gateway server's unique ID. Eg, the unique ID PayPal assigned
+	 * to the payment. This is handy for verifying an IPN hasn't already been processed.
+	 *
+	 * @param int|string $PAY_txn_id_chq_nmbr
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_payment_by_txn_id_chq_nmbr($PAY_txn_id_chq_nmbr): EE_Payment
+	{
+		return $this->get_one([['PAY_txn_id_chq_nmbr' => $PAY_txn_id_chq_nmbr]]);
+	}
+
+
+	/**
+	 *       retrieve  all payments from db for a particular transaction, optionally with
+	 *      a particular status
+	 *
+	 * @param int $TXN_ID
+	 * @param string $status_of_payment   one of EEM_Payment::status_id_*, like 'PAP','PCN',etc. If none is provided,
+	 *                                  gets payments with any status
+	 * @return EE_Payment[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_payments_for_transaction(int $TXN_ID, string $status_of_payment = ''): array
+	{
+		// all payments for a TXN ordered chronologically
+		$query_params = [['TXN_ID' => $TXN_ID], 'order_by' => ['PAY_timestamp' => 'ASC']];
+		// if provided with a status, search specifically for that status. Otherwise get them all
+		if ($status_of_payment) {
+			$query_params[0]['STS_ID'] = $status_of_payment;
+		}
+		// retrieve payments
+		return $this->get_all($query_params);
+	}
+
+
+	/**
+	 * Only gets payments which have been approved
+	 *
+	 * @param int $TXN_ID
+	 * @return EE_Payment[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_approved_payments_for_transaction(int $TXN_ID = 0): array
+	{
+		return $this->get_payments_for_transaction($TXN_ID, EEM_Payment::status_id_approved);
+	}
+
+
+	/**
+	 * retrieve  all payments from db between two dates,
+	 *
+	 * @param string $start_date        incoming start date. If empty the beginning of today is used.
+	 * @param string $end_date          incoming end date. If empty the end of today is used.
+	 * @param string $format            If you include $start_date or $end_date then you must include the format string
+	 *                                  for the format your date is in.
+	 * @param string $timezone          If your range is in a different timezone then the current setting on this
+	 *                                  WordPress install, then include it here.
+	 * @return EE_Payment[]
+	 * @throws ReflectionException
+	 *
+	 * @throws EE_Error
+	 */
+	public function get_payments_made_between_dates(
+		string $start_date = '',
+		string $end_date = '',
+		string $format = '',
+		string $timezone = ''
+	): array {
+		$timezone = empty($timezone) ? EEH_DTT_Helper::get_timezone() : $timezone;
+		// if $start_date or $end date, verify $format is included.
+		if ((! empty($start_date) || ! empty($end_date)) && empty($format)) {
+			throw new EE_Error(__('You included a start date and/or a end date for this method but did not include a format string.  The format string is needed for setting up the query',
+								  'event_espresso'));
+		}
+		$now = new DateTime('now');
+		// setup timezone objects once
+		$modelDateTimeZone  = new DateTimeZone($this->_timezone);
+		$passedDateTimeZone = new DateTimeZone($timezone);
+		// setup start date
+		$start_date = ! empty($start_date) ? date_create_from_format($format, $start_date, $passedDateTimeZone) : $now;
+		EEH_DTT_Helper::setTimezone($start_date, $modelDateTimeZone);
+		$start_date = $start_date->format('Y-m-d') . ' 00:00:00';
+		$start_date = strtotime($start_date);
+		// setup end date
+		$end_date = ! empty($end_date) ? date_create_from_format($format, $end_date, $passedDateTimeZone) : $now;
+		EEH_DTT_Helper::setTimezone($end_date, $modelDateTimeZone);
+		$end_date = $end_date->format('Y-m-d') . ' 23:59:59';
+		$end_date = strtotime($end_date);
+
+		// make sure our start date is the lowest value and vice versa
+		$start = min($start_date, $end_date);
+		$end   = max($start_date, $end_date);
+
+		// yes we generated the date and time string in utc but we WANT this start date and time used in the set timezone on the model.
+		$start_date = $this->convert_datetime_for_query('PAY_timestamp',
+														date('Y-m-d', $start) . ' 00:00:00',
+														'Y-m-d H:i:s',
+														$this->get_timezone());
+		$end_date   = $this->convert_datetime_for_query('PAY_timestamp',
+														date('Y-m-d', $end) . ' 23:59:59',
+														'Y-m-d H:i:s',
+														$this->get_timezone());
+
+		return $this->get_all([['PAY_timestamp' => ['>=', $start_date], 'PAY_timestamp*' => ['<=', $end_date]]]);
+	}
+
+	/**
+	 * methods for EEMI_Payment
+	 */
+	/**
+	 * returns a string for the approved status
+	 *
+	 * @return  string
+	 */
+	public function approved_status(): string
+	{
+		return self::status_id_approved;
+	}
+
+
+	/**
+	 * returns a string for the pending status
+	 *
+	 * @return  string
+	 */
+	public function pending_status(): string
+	{
+		return self::status_id_pending;
+	}
+
+
+	/**
+	 * returns a string for the cancelled status
+	 *
+	 * @return  string
+	 */
+	public function cancelled_status(): string
+	{
+		return self::status_id_cancelled;
+	}
+
+
+	/**
+	 * returns a string for the failed status
+	 *
+	 * @return  string
+	 */
+	public function failed_status(): string
+	{
+		return self::status_id_failed;
+	}
+
+
+	/**
+	 * returns a string for the declined status
+	 *
+	 * @return  string
+	 */
+	public function declined_status(): string
+	{
+		return self::status_id_declined;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -158,7 +158,7 @@ 
                 ),
             ],
         ];
-        $this->_model_relations        = [
+        $this->_model_relations = [
             'Transaction'          => new EE_Belongs_To_Relation(),
             'Status'               => new EE_Belongs_To_Relation(),
             'Payment_Method'       => new EE_Belongs_To_Relation(),
@@ -246,7 +246,7 @@ 
     ): array {
         $timezone = empty($timezone) ? EEH_DTT_Helper::get_timezone() : $timezone;
         // if $start_date or $end date, verify $format is included.
-        if ((! empty($start_date) || ! empty($end_date)) && empty($format)) {
+        if (( ! empty($start_date) || ! empty($end_date)) && empty($format)) {
             throw new EE_Error(__('You included a start date and/or a end date for this method but did not include a format string.  The format string is needed for setting up the query',
                                   'event_espresso'));
         }
@@ -257,12 +257,12 @@ 
         // setup start date
         $start_date = ! empty($start_date) ? date_create_from_format($format, $start_date, $passedDateTimeZone) : $now;
         EEH_DTT_Helper::setTimezone($start_date, $modelDateTimeZone);
-        $start_date = $start_date->format('Y-m-d') . ' 00:00:00';
+        $start_date = $start_date->format('Y-m-d').' 00:00:00';
         $start_date = strtotime($start_date);
         // setup end date
         $end_date = ! empty($end_date) ? date_create_from_format($format, $end_date, $passedDateTimeZone) : $now;
         EEH_DTT_Helper::setTimezone($end_date, $modelDateTimeZone);
-        $end_date = $end_date->format('Y-m-d') . ' 23:59:59';
+        $end_date = $end_date->format('Y-m-d').' 23:59:59';
         $end_date = strtotime($end_date);
 
         // make sure our start date is the lowest value and vice versa
@@ -271,11 +271,11 @@ 
 
         // yes we generated the date and time string in utc but we WANT this start date and time used in the set timezone on the model.
         $start_date = $this->convert_datetime_for_query('PAY_timestamp',
-                                                        date('Y-m-d', $start) . ' 00:00:00',
+                                                        date('Y-m-d', $start).' 00:00:00',
                                                         'Y-m-d H:i:s',
                                                         $this->get_timezone());
-        $end_date   = $this->convert_datetime_for_query('PAY_timestamp',
-                                                        date('Y-m-d', $end) . ' 23:59:59',
+        $end_date = $this->convert_datetime_for_query('PAY_timestamp',
+                                                        date('Y-m-d', $end).' 23:59:59',
                                                         'Y-m-d H:i:s',
                                                         $this->get_timezone());
 

core/db_models/EEM_Venue.model.php

Indentation +203 added lines, -203 removed lines

@@ -10,209 +10,209 @@
 class EEM_Venue extends EEM_CPT_Base
 {
 
-    /**
-     * @var EEM_Venue
-     */
-    protected static $_instance;
+	/**
+	 * @var EEM_Venue
+	 */
+	protected static $_instance;
 
 
-    /**
-     * EEM_Venue constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item    = esc_html__('Venue', 'event_espresso');
-        $this->plural_item      = esc_html__('Venues', 'event_espresso');
-        $this->_tables          = [
-            'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
-            'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
-        ];
-        $this->_fields          = [
-            'Venue_CPT'  => [
-                'VNU_ID'         => new EE_Primary_Key_Int_Field(
-                    'ID',
-                    esc_html__("Venue ID", "event_espresso")
-                ),
-                'VNU_name'       => new EE_Plain_Text_Field(
-                    'post_title',
-                    esc_html__("Venue Name", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_desc'       => new EE_Post_Content_Field(
-                    'post_content',
-                    esc_html__("Venue Description", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_identifier' => new EE_Slug_Field(
-                    'post_name',
-                    esc_html__("Venue Identifier", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_created'    => new EE_Datetime_Field(
-                    'post_date',
-                    esc_html__("Date Venue Created", "event_espresso"),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'VNU_short_desc' => new EE_Plain_Text_Field(
-                    'post_excerpt',
-                    esc_html__("Short Description of Venue", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_modified'   => new EE_Datetime_Field(
-                    'post_modified',
-                    esc_html__("Venue Modified Date", "event_espresso"),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'VNU_wp_user'    => new EE_WP_User_Field(
-                    'post_author',
-                    esc_html__("Venue Creator ID", "event_espresso"),
-                    false
-                ),
-                'parent'         => new EE_Integer_Field(
-                    'post_parent',
-                    esc_html__("Venue Parent ID", "event_espresso"),
-                    false,
-                    0
-                ),
-                'VNU_order'      => new EE_Integer_Field(
-                    'menu_order',
-                    esc_html__("Venue order", "event_espresso"),
-                    false,
-                    1
-                ),
-                'post_type'      => new EE_WP_Post_Type_Field('espresso_venues'),
-                'password'       => new EE_Password_Field(
-                    'post_password',
-                    esc_html__('Password', 'event_espresso'),
-                    false,
-                    '',
-                    [
-                        'VNU_desc',
-                        'VNU_short_desc',
-                        'VNU_address',
-                        'VNU_address2',
-                        'VNU_city',
-                        'STA_ID',
-                        'CNT_ISO',
-                        'VNU_zip',
-                        'VNU_phone',
-                        'VNU_capacity',
-                        'VNU_url',
-                        'VNU_virtual_phone',
-                        'VNU_virtual_url',
-                        'VNU_google_map_link',
-                        'VNU_enable_for_gmap',
-                    ]
-                ),
-            ],
-            'Venue_Meta' => [
-                'VNUM_ID'             => new EE_DB_Only_Int_Field(
-                    'VNUM_ID',
-                    esc_html__("ID of Venue Meta Row", "event_espresso"),
-                    false
-                ),
-                'VNU_ID_fk'           => new EE_DB_Only_Int_Field(
-                    'VNU_ID',
-                    esc_html__("Foreign Key to Venue Post ", "event_espresso"),
-                    false
-                ),
-                'VNU_address'         => new EE_Plain_Text_Field(
-                    'VNU_address',
-                    esc_html__("Venue Address line 1", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_address2'        => new EE_Plain_Text_Field(
-                    'VNU_address2',
-                    esc_html__("Venue Address line 2", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_city'            => new EE_Plain_Text_Field(
-                    'VNU_city',
-                    esc_html__("Venue City", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'STA_ID'              => new EE_Foreign_Key_Int_Field(
-                    'STA_ID',
-                    esc_html__("State ID", "event_espresso"),
-                    true,
-                    null,
-                    'State'
-                ),
-                'CNT_ISO'             => new EE_Foreign_Key_String_Field(
-                    'CNT_ISO',
-                    esc_html__("Country Code", "event_espresso"),
-                    true,
-                    null,
-                    'Country'
-                ),
-                'VNU_zip'             => new EE_Plain_Text_Field(
-                    'VNU_zip',
-                    esc_html__("Venue Zip/Postal Code", "event_espresso"),
-                    true
-                ),
-                'VNU_phone'           => new EE_Plain_Text_Field(
-                    'VNU_phone',
-                    esc_html__("Venue Phone", "event_espresso"),
-                    true
-                ),
-                'VNU_capacity'        => new EE_Infinite_Integer_Field(
-                    'VNU_capacity',
-                    esc_html__("Venue Capacity", "event_espresso"),
-                    true,
-                    EE_INF
-                ),
-                'VNU_url'             => new EE_Plain_Text_Field(
-                    'VNU_url',
-                    esc_html__('Venue Website', 'event_espresso'),
-                    true
-                ),
-                'VNU_virtual_phone'   => new EE_Plain_Text_Field(
-                    'VNU_virtual_phone',
-                    esc_html__('Call in Number', 'event_espresso'),
-                    true
-                ),
-                'VNU_virtual_url'     => new EE_Plain_Text_Field(
-                    'VNU_virtual_url',
-                    esc_html__('Virtual URL', 'event_espresso'),
-                    true
-                ),
-                'VNU_google_map_link' => new EE_Plain_Text_Field(
-                    'VNU_google_map_link',
-                    esc_html__('Google Map Link', 'event_espresso'),
-                    true
-                ),
-                'VNU_enable_for_gmap' => new EE_Boolean_Field(
-                    'VNU_enable_for_gmap',
-                    esc_html__('Show Google Map?', 'event_espresso'),
-                    false,
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Event'             => new EE_HABTM_Relation('Event_Venue'),
-            'State'             => new EE_Belongs_To_Relation(),
-            'Country'           => new EE_Belongs_To_Relation(),
-            'Event_Venue'       => new EE_Has_Many_Relation(),
-            'WP_User'           => new EE_Belongs_To_Relation(),
-            'Term_Relationship' => new EE_Has_Many_Relation(),
-            'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->model_chain_to_password                            = '';
-        parent::__construct($timezone);
-    }
+	/**
+	 * EEM_Venue constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item    = esc_html__('Venue', 'event_espresso');
+		$this->plural_item      = esc_html__('Venues', 'event_espresso');
+		$this->_tables          = [
+			'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
+			'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
+		];
+		$this->_fields          = [
+			'Venue_CPT'  => [
+				'VNU_ID'         => new EE_Primary_Key_Int_Field(
+					'ID',
+					esc_html__("Venue ID", "event_espresso")
+				),
+				'VNU_name'       => new EE_Plain_Text_Field(
+					'post_title',
+					esc_html__("Venue Name", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_desc'       => new EE_Post_Content_Field(
+					'post_content',
+					esc_html__("Venue Description", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_identifier' => new EE_Slug_Field(
+					'post_name',
+					esc_html__("Venue Identifier", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_created'    => new EE_Datetime_Field(
+					'post_date',
+					esc_html__("Date Venue Created", "event_espresso"),
+					false,
+					EE_Datetime_Field::now
+				),
+				'VNU_short_desc' => new EE_Plain_Text_Field(
+					'post_excerpt',
+					esc_html__("Short Description of Venue", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_modified'   => new EE_Datetime_Field(
+					'post_modified',
+					esc_html__("Venue Modified Date", "event_espresso"),
+					false,
+					EE_Datetime_Field::now
+				),
+				'VNU_wp_user'    => new EE_WP_User_Field(
+					'post_author',
+					esc_html__("Venue Creator ID", "event_espresso"),
+					false
+				),
+				'parent'         => new EE_Integer_Field(
+					'post_parent',
+					esc_html__("Venue Parent ID", "event_espresso"),
+					false,
+					0
+				),
+				'VNU_order'      => new EE_Integer_Field(
+					'menu_order',
+					esc_html__("Venue order", "event_espresso"),
+					false,
+					1
+				),
+				'post_type'      => new EE_WP_Post_Type_Field('espresso_venues'),
+				'password'       => new EE_Password_Field(
+					'post_password',
+					esc_html__('Password', 'event_espresso'),
+					false,
+					'',
+					[
+						'VNU_desc',
+						'VNU_short_desc',
+						'VNU_address',
+						'VNU_address2',
+						'VNU_city',
+						'STA_ID',
+						'CNT_ISO',
+						'VNU_zip',
+						'VNU_phone',
+						'VNU_capacity',
+						'VNU_url',
+						'VNU_virtual_phone',
+						'VNU_virtual_url',
+						'VNU_google_map_link',
+						'VNU_enable_for_gmap',
+					]
+				),
+			],
+			'Venue_Meta' => [
+				'VNUM_ID'             => new EE_DB_Only_Int_Field(
+					'VNUM_ID',
+					esc_html__("ID of Venue Meta Row", "event_espresso"),
+					false
+				),
+				'VNU_ID_fk'           => new EE_DB_Only_Int_Field(
+					'VNU_ID',
+					esc_html__("Foreign Key to Venue Post ", "event_espresso"),
+					false
+				),
+				'VNU_address'         => new EE_Plain_Text_Field(
+					'VNU_address',
+					esc_html__("Venue Address line 1", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_address2'        => new EE_Plain_Text_Field(
+					'VNU_address2',
+					esc_html__("Venue Address line 2", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_city'            => new EE_Plain_Text_Field(
+					'VNU_city',
+					esc_html__("Venue City", "event_espresso"),
+					true,
+					''
+				),
+				'STA_ID'              => new EE_Foreign_Key_Int_Field(
+					'STA_ID',
+					esc_html__("State ID", "event_espresso"),
+					true,
+					null,
+					'State'
+				),
+				'CNT_ISO'             => new EE_Foreign_Key_String_Field(
+					'CNT_ISO',
+					esc_html__("Country Code", "event_espresso"),
+					true,
+					null,
+					'Country'
+				),
+				'VNU_zip'             => new EE_Plain_Text_Field(
+					'VNU_zip',
+					esc_html__("Venue Zip/Postal Code", "event_espresso"),
+					true
+				),
+				'VNU_phone'           => new EE_Plain_Text_Field(
+					'VNU_phone',
+					esc_html__("Venue Phone", "event_espresso"),
+					true
+				),
+				'VNU_capacity'        => new EE_Infinite_Integer_Field(
+					'VNU_capacity',
+					esc_html__("Venue Capacity", "event_espresso"),
+					true,
+					EE_INF
+				),
+				'VNU_url'             => new EE_Plain_Text_Field(
+					'VNU_url',
+					esc_html__('Venue Website', 'event_espresso'),
+					true
+				),
+				'VNU_virtual_phone'   => new EE_Plain_Text_Field(
+					'VNU_virtual_phone',
+					esc_html__('Call in Number', 'event_espresso'),
+					true
+				),
+				'VNU_virtual_url'     => new EE_Plain_Text_Field(
+					'VNU_virtual_url',
+					esc_html__('Virtual URL', 'event_espresso'),
+					true
+				),
+				'VNU_google_map_link' => new EE_Plain_Text_Field(
+					'VNU_google_map_link',
+					esc_html__('Google Map Link', 'event_espresso'),
+					true
+				),
+				'VNU_enable_for_gmap' => new EE_Boolean_Field(
+					'VNU_enable_for_gmap',
+					esc_html__('Show Google Map?', 'event_espresso'),
+					false,
+					false
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Event'             => new EE_HABTM_Relation('Event_Venue'),
+			'State'             => new EE_Belongs_To_Relation(),
+			'Country'           => new EE_Belongs_To_Relation(),
+			'Event_Venue'       => new EE_Has_Many_Relation(),
+			'WP_User'           => new EE_Belongs_To_Relation(),
+			'Term_Relationship' => new EE_Has_Many_Relation(),
+			'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->model_chain_to_password                            = '';
+		parent::__construct($timezone);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
             'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
             'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
         ];
-        $this->_fields          = [
+        $this->_fields = [
             'Venue_CPT'  => [
                 'VNU_ID'         => new EE_Primary_Key_Int_Field(
                     'ID',
@@ -211,7 +211,7 @@ 
             'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
         ];
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
         $this->model_chain_to_password                            = '';
         parent::__construct($timezone);
     }

core/db_models/EEM_Extra_Join.model.php

Indentation +58 added lines, -58 removed lines

@@ -21,65 +21,65 @@
  */
 class EEM_Extra_Join extends EEM_Base
 {
-    // private instance of the Extra Join object
-    protected static $_instance;
+	// private instance of the Extra Join object
+	protected static $_instance;
 
 
-    /**
-     * EEM_Extra_Join constructor.
-     *
-     * @param string $timezone
-     * @throws EE_Error
-     */
-    public function __construct(string $timezone = '')
-    {
-        $models_this_can_join = array_keys(EE_Registry::instance()->non_abstract_db_models);
-        $this->_tables        = [
-            'Extra_Join' => new EE_Primary_Table('esp_extra_join', 'EXJ_ID'),
-        ];
-        $this->_fields        = [
-            'Extra_Join' => [
-                'EXJ_ID'                => new EE_Primary_Key_Int_Field(
-                    'EXJ_ID', esc_html__('Extra Join ID', 'event_espresso')
-                ),
-                'EXJ_first_model_ID'    => new EE_Foreign_Key_String_Field(
-                    'EXJ_first_model_ID',
-                    esc_html__('First Model ID', 'event_espresso'),
-                    true,
-                    0,
-                    $models_this_can_join
-                ),
-                'EXJ_first_model_name'  => new EE_Any_Foreign_Model_Name_Field(
-                    'EXJ_first_model_name',
-                    esc_html__('First Model Name', 'event_espresso'),
-                    true,
-                    '',
-                    $models_this_can_join
-                ),
-                'EXJ_second_model_ID'   => new EE_Foreign_Key_String_Field(
-                    'EXJ_second_model_ID',
-                    esc_html__('Second Model ID', 'event_espresso'),
-                    true,
-                    0,
-                    $models_this_can_join
-                ),
-                'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field(
-                    'EXJ_second_model_name',
-                    esc_html__('Second Model Name', 'event_espresso'),
-                    true,
-                    '',
-                    $models_this_can_join
-                ),
+	/**
+	 * EEM_Extra_Join constructor.
+	 *
+	 * @param string $timezone
+	 * @throws EE_Error
+	 */
+	public function __construct(string $timezone = '')
+	{
+		$models_this_can_join = array_keys(EE_Registry::instance()->non_abstract_db_models);
+		$this->_tables        = [
+			'Extra_Join' => new EE_Primary_Table('esp_extra_join', 'EXJ_ID'),
+		];
+		$this->_fields        = [
+			'Extra_Join' => [
+				'EXJ_ID'                => new EE_Primary_Key_Int_Field(
+					'EXJ_ID', esc_html__('Extra Join ID', 'event_espresso')
+				),
+				'EXJ_first_model_ID'    => new EE_Foreign_Key_String_Field(
+					'EXJ_first_model_ID',
+					esc_html__('First Model ID', 'event_espresso'),
+					true,
+					0,
+					$models_this_can_join
+				),
+				'EXJ_first_model_name'  => new EE_Any_Foreign_Model_Name_Field(
+					'EXJ_first_model_name',
+					esc_html__('First Model Name', 'event_espresso'),
+					true,
+					'',
+					$models_this_can_join
+				),
+				'EXJ_second_model_ID'   => new EE_Foreign_Key_String_Field(
+					'EXJ_second_model_ID',
+					esc_html__('Second Model ID', 'event_espresso'),
+					true,
+					0,
+					$models_this_can_join
+				),
+				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field(
+					'EXJ_second_model_name',
+					esc_html__('Second Model Name', 'event_espresso'),
+					true,
+					'',
+					$models_this_can_join
+				),
 
-            ],
-        ];
-        // this model is weird in that it has two foreign key columns which can point to any model/table.
-        // eg a foreign key to event will be in "EXJ_first_model_ID", provided the other
-        // model linked to is alphabetically greater than event (eg venue).
-        // but if the model linked to is alphabetically lower (eg attendee),
-        // the foreign key to the event will be in "EXJ_second_model_ID"
-        // so normal usage of foreign keys is weird. So don't define any
-        // relations to other models because they won't work properly with this model
-        parent::__construct($timezone);
-    }
+			],
+		];
+		// this model is weird in that it has two foreign key columns which can point to any model/table.
+		// eg a foreign key to event will be in "EXJ_first_model_ID", provided the other
+		// model linked to is alphabetically greater than event (eg venue).
+		// but if the model linked to is alphabetically lower (eg attendee),
+		// the foreign key to the event will be in "EXJ_second_model_ID"
+		// so normal usage of foreign keys is weird. So don't define any
+		// relations to other models because they won't work properly with this model
+		parent::__construct($timezone);
+	}
 }

core/db_models/EEM_State.model.php

Indentation +209 added lines, -209 removed lines

@@ -10,213 +10,213 @@
 class EEM_State extends EEM_Base
 {
 
-    /**
-     * @var EEM_State
-     */
-    protected static $_instance;
-
-    /**
-     * @var EE_State[]
-     */
-    private static $_all_states;
-
-    /**
-     * @var EE_State[]
-     */
-    private static $_active_states;
-
-
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item = esc_html__('State/Province', 'event_espresso');
-        $this->plural_item   = esc_html__('States/Provinces', 'event_espresso');
-
-        $this->_tables = [
-            'State' => new EE_Primary_Table('esp_state', 'STA_ID'),
-        ];
-
-        $this->_fields          = [
-            'State' => [
-                'STA_ID'     => new EE_Primary_Key_Int_Field(
-                    'STA_ID',
-                    esc_html__('State ID', 'event_espresso')
-                ),
-                'CNT_ISO'    => new EE_Foreign_Key_String_Field(
-                    'CNT_ISO',
-                    esc_html__('Country ISO Code', 'event_espresso'),
-                    false,
-                    null,
-                    'Country'
-                ),
-                'STA_abbrev' => new EE_Plain_Text_Field(
-                    'STA_abbrev',
-                    esc_html__('State Abbreviation', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'STA_name'   => new EE_Plain_Text_Field(
-                    'STA_name',
-                    esc_html__('State Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'STA_active' => new EE_Boolean_Field(
-                    'STA_active',
-                    esc_html__('State Active Flag', 'event_espresso'),
-                    false,
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Attendee' => new EE_Has_Many_Relation(),
-            'Country'  => new EE_Belongs_To_Relation(),
-            'Venue'    => new EE_Has_Many_Relation(),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        // @todo: only show STA_active
-        parent::__construct($timezone);
-    }
-
-
-    /**
-     * reset_cached_states
-     *
-     * @return void
-     */
-    public function reset_cached_states()
-    {
-        EEM_State::$_active_states = null;
-        EEM_State::$_all_states    = null;
-    }
-
-
-    /**
-     * _get_states
-     *
-     * @return EE_State[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_states(): array
-    {
-        if (self::$_all_states === null) {
-            self::$_all_states = $this->get_all(['order_by' => ['STA_name' => 'ASC'], 'limit' => [0, 99999]]);
-        }
-        return self::$_all_states;
-    }
-
-
-    /**
-     * @param EE_Country[] $countries
-     * @param bool         $flush_cache
-     * @return EE_State[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_active_states(array $countries = [], bool $flush_cache = false): array
-    {
-        if (! self::$_active_states || $flush_cache) {
-            $countries            = ! empty($countries) && is_array($countries)
-                ? $countries
-                : EEM_Country::instance()->get_all_active_countries();
-            self::$_active_states = $this->get_all(
-                [
-                    [
-                        'STA_active' => true,
-                        'CNT_ISO'    => ['IN', array_keys($countries)],
-                    ],
-                    'order_by'   => ['STA_name' => 'ASC'],
-                    'limit'      => [0, 99999],
-                    'force_join' => ['Country'],
-                ]
-            );
-        }
-        return self::$_active_states;
-    }
-
-
-    /**
-     *  get_all_states_of_active_countries
-     *
-     * @return EE_State[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_states_of_active_countries(): array
-    {
-        return $this->get_all(
-            [
-                ['Country.CNT_active' => true, 'STA_active' => true],
-                'order_by' => ['Country.CNT_name' => 'ASC', 'STA_name' => 'ASC'],
-            ]
-        );
-    }
-
-
-    /**
-     *  get_all_states_of_active_countries
-     *
-     * @param $countries
-     * @return EE_State[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_active_states_for_these_countries($countries): array
-    {
-        if (! $countries) {
-            return [];
-        }
-        return $this->get_all(
-            [
-                ['Country.CNT_ISO' => ['IN', array_keys($countries)], 'STA_active' => true],
-                'order_by' => ['Country.CNT_name' => 'ASC', 'STA_name' => 'ASC'],
-            ]
-        );
-    }
-
-
-    /**
-     *  get_all_states_of_active_countries
-     *
-     * @param $countries
-     * @return EE_State[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_states_for_these_countries($countries): array
-    {
-        if (! $countries) {
-            return [];
-        }
-        return $this->get_all(
-            [
-                ['Country.CNT_ISO' => ['IN', array_keys($countries)]],
-                'order_by' => ['Country.CNT_name' => 'ASC', 'STA_name' => 'ASC'],
-            ]
-        );
-    }
-
-
-    /**
-     * Gets the state's name by its ID
-     *
-     * @param string $state_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_state_name_by_ID(string $state_ID): string
-    {
-        if (
-            isset(self::$_all_states[ $state_ID ]) && self::$_all_states[ $state_ID ] instanceof EE_State
-        ) {
-            return self::$_all_states[ $state_ID ]->name();
-        }
-        $names = $this->get_col([['STA_ID' => $state_ID], 'limit' => 1], 'STA_name');
-        return is_array($names) && ! empty($names)
-            ? reset($names)
-            : '';
-    }
+	/**
+	 * @var EEM_State
+	 */
+	protected static $_instance;
+
+	/**
+	 * @var EE_State[]
+	 */
+	private static $_all_states;
+
+	/**
+	 * @var EE_State[]
+	 */
+	private static $_active_states;
+
+
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item = esc_html__('State/Province', 'event_espresso');
+		$this->plural_item   = esc_html__('States/Provinces', 'event_espresso');
+
+		$this->_tables = [
+			'State' => new EE_Primary_Table('esp_state', 'STA_ID'),
+		];
+
+		$this->_fields          = [
+			'State' => [
+				'STA_ID'     => new EE_Primary_Key_Int_Field(
+					'STA_ID',
+					esc_html__('State ID', 'event_espresso')
+				),
+				'CNT_ISO'    => new EE_Foreign_Key_String_Field(
+					'CNT_ISO',
+					esc_html__('Country ISO Code', 'event_espresso'),
+					false,
+					null,
+					'Country'
+				),
+				'STA_abbrev' => new EE_Plain_Text_Field(
+					'STA_abbrev',
+					esc_html__('State Abbreviation', 'event_espresso'),
+					false,
+					''
+				),
+				'STA_name'   => new EE_Plain_Text_Field(
+					'STA_name',
+					esc_html__('State Name', 'event_espresso'),
+					false,
+					''
+				),
+				'STA_active' => new EE_Boolean_Field(
+					'STA_active',
+					esc_html__('State Active Flag', 'event_espresso'),
+					false,
+					false
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Attendee' => new EE_Has_Many_Relation(),
+			'Country'  => new EE_Belongs_To_Relation(),
+			'Venue'    => new EE_Has_Many_Relation(),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		// @todo: only show STA_active
+		parent::__construct($timezone);
+	}
+
+
+	/**
+	 * reset_cached_states
+	 *
+	 * @return void
+	 */
+	public function reset_cached_states()
+	{
+		EEM_State::$_active_states = null;
+		EEM_State::$_all_states    = null;
+	}
+
+
+	/**
+	 * _get_states
+	 *
+	 * @return EE_State[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_states(): array
+	{
+		if (self::$_all_states === null) {
+			self::$_all_states = $this->get_all(['order_by' => ['STA_name' => 'ASC'], 'limit' => [0, 99999]]);
+		}
+		return self::$_all_states;
+	}
+
+
+	/**
+	 * @param EE_Country[] $countries
+	 * @param bool         $flush_cache
+	 * @return EE_State[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_active_states(array $countries = [], bool $flush_cache = false): array
+	{
+		if (! self::$_active_states || $flush_cache) {
+			$countries            = ! empty($countries) && is_array($countries)
+				? $countries
+				: EEM_Country::instance()->get_all_active_countries();
+			self::$_active_states = $this->get_all(
+				[
+					[
+						'STA_active' => true,
+						'CNT_ISO'    => ['IN', array_keys($countries)],
+					],
+					'order_by'   => ['STA_name' => 'ASC'],
+					'limit'      => [0, 99999],
+					'force_join' => ['Country'],
+				]
+			);
+		}
+		return self::$_active_states;
+	}
+
+
+	/**
+	 *  get_all_states_of_active_countries
+	 *
+	 * @return EE_State[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_states_of_active_countries(): array
+	{
+		return $this->get_all(
+			[
+				['Country.CNT_active' => true, 'STA_active' => true],
+				'order_by' => ['Country.CNT_name' => 'ASC', 'STA_name' => 'ASC'],
+			]
+		);
+	}
+
+
+	/**
+	 *  get_all_states_of_active_countries
+	 *
+	 * @param $countries
+	 * @return EE_State[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_active_states_for_these_countries($countries): array
+	{
+		if (! $countries) {
+			return [];
+		}
+		return $this->get_all(
+			[
+				['Country.CNT_ISO' => ['IN', array_keys($countries)], 'STA_active' => true],
+				'order_by' => ['Country.CNT_name' => 'ASC', 'STA_name' => 'ASC'],
+			]
+		);
+	}
+
+
+	/**
+	 *  get_all_states_of_active_countries
+	 *
+	 * @param $countries
+	 * @return EE_State[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_states_for_these_countries($countries): array
+	{
+		if (! $countries) {
+			return [];
+		}
+		return $this->get_all(
+			[
+				['Country.CNT_ISO' => ['IN', array_keys($countries)]],
+				'order_by' => ['Country.CNT_name' => 'ASC', 'STA_name' => 'ASC'],
+			]
+		);
+	}
+
+
+	/**
+	 * Gets the state's name by its ID
+	 *
+	 * @param string $state_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_state_name_by_ID(string $state_ID): string
+	{
+		if (
+			isset(self::$_all_states[ $state_ID ]) && self::$_all_states[ $state_ID ] instanceof EE_State
+		) {
+			return self::$_all_states[ $state_ID ]->name();
+		}
+		$names = $this->get_col([['STA_ID' => $state_ID], 'limit' => 1], 'STA_name');
+		return is_array($names) && ! empty($names)
+			? reset($names)
+			: '';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
             'State' => new EE_Primary_Table('esp_state', 'STA_ID'),
         ];
 
-        $this->_fields          = [
+        $this->_fields = [
             'State' => [
                 'STA_ID'     => new EE_Primary_Key_Int_Field(
                     'STA_ID',
@@ -74,7 +74,7 @@ 
             'Venue'    => new EE_Has_Many_Relation(),
         ];
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
         // @todo: only show STA_active
         parent::__construct($timezone);
     }
@@ -117,7 +117,7 @@ 
      */
     public function get_all_active_states(array $countries = [], bool $flush_cache = false): array
     {
-        if (! self::$_active_states || $flush_cache) {
+        if ( ! self::$_active_states || $flush_cache) {
             $countries            = ! empty($countries) && is_array($countries)
                 ? $countries
                 : EEM_Country::instance()->get_all_active_countries();
@@ -165,7 +165,7 @@ 
      */
     public function get_all_active_states_for_these_countries($countries): array
     {
-        if (! $countries) {
+        if ( ! $countries) {
             return [];
         }
         return $this->get_all(
@@ -187,7 +187,7 @@ 
      */
     public function get_all_states_for_these_countries($countries): array
     {
-        if (! $countries) {
+        if ( ! $countries) {
             return [];
         }
         return $this->get_all(
@@ -210,9 +210,9 @@ 
     public function get_state_name_by_ID(string $state_ID): string
     {
         if (
-            isset(self::$_all_states[ $state_ID ]) && self::$_all_states[ $state_ID ] instanceof EE_State
+            isset(self::$_all_states[$state_ID]) && self::$_all_states[$state_ID] instanceof EE_State
         ) {
-            return self::$_all_states[ $state_ID ]->name();
+            return self::$_all_states[$state_ID]->name();
         }
         $names = $this->get_col([['STA_ID' => $state_ID], 'limit' => 1], 'STA_name');
         return is_array($names) && ! empty($names)

core/db_models/EEM_Post_Meta.model.php

Indentation +49 added lines, -49 removed lines

@@ -18,56 +18,56 @@
 class EEM_Post_Meta extends EEM_Base
 {
 
-    // private instance of the EE_Post_Meta object
-    protected static $_instance;
+	// private instance of the EE_Post_Meta object
+	protected static $_instance;
 
 
 
-    protected function __construct(string $timezone = '')
-    {
-        $this->singular_item = esc_html__('Post Meta', 'event_espresso');
-        $this->plural_item = esc_html__('Post Metas', 'event_espresso');
-        $this->_tables = array(
-            'Post_Meta' => new EE_Primary_Table('postmeta', 'meta_id'),
-        );
-        $models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
-        $this->_fields = array(
-            'Post_Meta' => array(
-                'meta_id'    => new EE_Primary_Key_Int_Field(
-                    'meta_id',
-                    esc_html__("Meta ID", "event_espresso")
-                ),
-                'post_id'    => new EE_Foreign_Key_Int_Field(
-                    'post_id',
-                    esc_html__("Primary Key of Post", "event_espresso"),
-                    false,
-                    0,
-                    $models_this_can_attach_to
-                ),
-                'meta_key'   => new EE_Plain_Text_Field(
-                    'meta_key',
-                    esc_html__("Meta Key", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'meta_value' => new EE_Maybe_Serialized_Text_Field(
-                    'meta_value',
-                    esc_html__("Meta Value", "event_espresso"),
-                    true
-                ),
-            ),
-        );
-        $this->_model_relations = array();
-        foreach ($models_this_can_attach_to as $model) {
-            $this->_model_relations[ $model ] = new EE_Belongs_To_Relation();
-        }
-        $this->_wp_core_model = true;
-        foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
-            $this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta(
-                'meta_key',
-                'meta_value'
-            );
-        }
-        parent::__construct($timezone);
-    }
+	protected function __construct(string $timezone = '')
+	{
+		$this->singular_item = esc_html__('Post Meta', 'event_espresso');
+		$this->plural_item = esc_html__('Post Metas', 'event_espresso');
+		$this->_tables = array(
+			'Post_Meta' => new EE_Primary_Table('postmeta', 'meta_id'),
+		);
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
+		$this->_fields = array(
+			'Post_Meta' => array(
+				'meta_id'    => new EE_Primary_Key_Int_Field(
+					'meta_id',
+					esc_html__("Meta ID", "event_espresso")
+				),
+				'post_id'    => new EE_Foreign_Key_Int_Field(
+					'post_id',
+					esc_html__("Primary Key of Post", "event_espresso"),
+					false,
+					0,
+					$models_this_can_attach_to
+				),
+				'meta_key'   => new EE_Plain_Text_Field(
+					'meta_key',
+					esc_html__("Meta Key", "event_espresso"),
+					false,
+					''
+				),
+				'meta_value' => new EE_Maybe_Serialized_Text_Field(
+					'meta_value',
+					esc_html__("Meta Value", "event_espresso"),
+					true
+				),
+			),
+		);
+		$this->_model_relations = array();
+		foreach ($models_this_can_attach_to as $model) {
+			$this->_model_relations[ $model ] = new EE_Belongs_To_Relation();
+		}
+		$this->_wp_core_model = true;
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta(
+				'meta_key',
+				'meta_value'
+			);
+		}
+		parent::__construct($timezone);
+	}
 }