eventespresso / event-espresso-core

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Indentation +1426 added lines, -1426 removed lines

@@ -19,1441 +19,1441 @@
  */
 class General_Settings_Admin_Page extends EE_Admin_Page
 {
-    /**
-     * @var EE_Core_Config
-     */
-    public $core_config;
-
-
-    /**
-     * Initialize basic properties.
-     */
-    protected function _init_page_props()
-    {
-        $this->page_slug        = GEN_SET_PG_SLUG;
-        $this->page_label       = GEN_SET_LABEL;
-        $this->_admin_base_url  = GEN_SET_ADMIN_URL;
-        $this->_admin_base_path = GEN_SET_ADMIN;
-
-        $this->core_config = EE_Registry::instance()->CFG->core;
-    }
-
-
-    /**
-     * Set ajax hooks
-     */
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_espresso_display_country_settings', [$this, 'display_country_settings']);
-        add_action('wp_ajax_espresso_display_country_states', [$this, 'display_country_states']);
-        add_action('wp_ajax_espresso_delete_state', [$this, 'delete_state'], 10, 3);
-        add_action('wp_ajax_espresso_add_new_state', [$this, 'add_new_state']);
-    }
-
-
-    /**
-     * More page properties initialization.
-     */
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = GEN_SET_LABEL;
-        $this->_labels           = ['publishbox' => esc_html__('Update Settings', 'event_espresso')];
-    }
-
-
-    /**
-     * Set page routes property.
-     */
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = [
-            'critical_pages'                => [
-                'func'       => [$this, '_espresso_page_settings'],
-                'capability' => 'manage_options',
-            ],
-            'update_espresso_page_settings' => [
-                'func'       => [$this, '_update_espresso_page_settings'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'default'                       => [
-                'func'       => [$this, '_your_organization_settings'],
-                'capability' => 'manage_options',
-            ],
-
-            'update_your_organization_settings' => [
-                'func'       => [$this, '_update_your_organization_settings'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'admin_option_settings' => [
-                'func'       => [$this, '_admin_option_settings'],
-                'capability' => 'manage_options',
-            ],
-
-            'update_admin_option_settings' => [
-                'func'       => [$this, '_update_admin_option_settings'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'country_settings' => [
-                'func'       => [$this, '_country_settings'],
-                'capability' => 'manage_options',
-            ],
-
-            'update_country_settings' => [
-                'func'       => [$this, '_update_country_settings'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'display_country_settings' => [
-                'func'       => [$this, 'display_country_settings'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'add_new_state' => [
-                'func'       => [$this, 'add_new_state'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'delete_state'            => [
-                'func'       => [$this, 'delete_state'],
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'privacy_settings'        => [
-                'func'       => [$this, 'privacySettings'],
-                'capability' => 'manage_options',
-            ],
-            'update_privacy_settings' => [
-                'func'               => [$this, 'updatePrivacySettings'],
-                'capability'         => 'manage_options',
-                'noheader'           => true,
-                'headers_sent_route' => 'privacy_settings',
-            ],
-        ];
-    }
-
-
-    /**
-     * Set page configuration property
-     */
-    protected function _set_page_config()
-    {
-        $this->_page_config = [
-            'critical_pages'        => [
-                'nav'           => [
-                    'label' => esc_html__('Critical Pages', 'event_espresso'),
-                    'order' => 50,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_critical_pages_help_tab' => [
-                        'title'    => esc_html__('Critical Pages', 'event_espresso'),
-                        'filename' => 'general_settings_critical_pages',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'default'               => [
-                'nav'           => [
-                    'label' => esc_html__('Your Organization', 'event_espresso'),
-                    'order' => 20,
-                ],
-                'help_tabs'     => [
-                    'general_settings_your_organization_help_tab' => [
-                        'title'    => esc_html__('Your Organization', 'event_espresso'),
-                        'filename' => 'general_settings_your_organization',
-                    ],
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'require_nonce' => false,
-            ],
-            'admin_option_settings' => [
-                'nav'           => [
-                    'label' => esc_html__('Admin Options', 'event_espresso'),
-                    'order' => 60,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_admin_options_help_tab' => [
-                        'title'    => esc_html__('Admin Options', 'event_espresso'),
-                        'filename' => 'general_settings_admin_options',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'country_settings'      => [
-                'nav'           => [
-                    'label' => esc_html__('Countries', 'event_espresso'),
-                    'order' => 70,
-                ],
-                'help_tabs'     => [
-                    'general_settings_countries_help_tab' => [
-                        'title'    => esc_html__('Countries', 'event_espresso'),
-                        'filename' => 'general_settings_countries',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'privacy_settings'      => [
-                'nav'           => [
-                    'label' => esc_html__('Privacy', 'event_espresso'),
-                    'order' => 80,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'require_nonce' => false,
-            ],
-        ];
-    }
-
-
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    /**
-     * Enqueue global scripts and styles for all routes in the General Settings Admin Pages.
-     */
-    public function load_scripts_styles()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        // scripts
-        wp_enqueue_script('ee_admin_js');
-    }
-
-
-    /**
-     * Execute logic running on `admin_init`
-     */
-    public function admin_init()
-    {
-        EE_Registry::$i18n_js_strings['invalid_server_response'] = wp_strip_all_tags(
-            esc_html__(
-                'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
-                'event_espresso'
-            )
-        );
-        EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(
-            esc_html__(
-                'An error occurred! Please refresh the page and try again.',
-                'event_espresso'
-            )
-        );
-        EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(
-            esc_html__(
-                'Are you sure you want to delete this State / Province?',
-                'event_espresso'
-            )
-        );
-        EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
-            'admin-ajax.php?page=espresso_general_settings',
-            is_ssl() ? 'https://' : 'http://'
-        );
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    /**
-     * Enqueue scripts and styles for the default route.
-     */
-    public function load_scripts_styles_default()
-    {
-        // styles
-        wp_enqueue_style('thickbox');
-        // scripts
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('thickbox');
-        wp_register_script(
-            'organization_settings',
-            GEN_SET_ASSETS_URL . 'your_organization_settings.js',
-            ['jquery', 'media-upload', 'thickbox'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
-        wp_enqueue_script('organization_settings');
-        wp_enqueue_style('organization-css');
-        $confirm_image_delete = [
-            'text' => wp_strip_all_tags(
-                esc_html__(
-                    'Do you really want to delete this image? Please remember to save your settings to complete the removal.',
-                    'event_espresso'
-                )
-            ),
-        ];
-        wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
-    }
-
-
-    /**
-     * Enqueue scripts and styles for the country settings route.
-     */
-    public function load_scripts_styles_country_settings()
-    {
-        // scripts
-        wp_register_script(
-            'gen_settings_countries',
-            GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
-            ['ee_admin_js'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
-        wp_enqueue_script('gen_settings_countries');
-        wp_enqueue_style('organization-css');
-    }
-
-
-    /*************        Espresso Pages        *************/
-    /**
-     * _espresso_page_settings
-     *
-     * @throws EE_Error
-     * @throws DomainException
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    protected function _espresso_page_settings()
-    {
-        // Check to make sure all of the main pages are set up properly,
-        // if not create the default pages and display an admin notice
-        EEH_Activation::verify_default_pages_exist();
-        $this->_transient_garbage_collection();
-
-        $this->_template_args['values'] = $this->_yes_no_values;
-
-        $this->_template_args['reg_page_id']  = $this->core_config->reg_page_id ?? null;
-        $this->_template_args['reg_page_obj'] = isset($this->core_config->reg_page_id)
-            ? get_post($this->core_config->reg_page_id)
-            : false;
-
-        $this->_template_args['txn_page_id']  = $this->core_config->txn_page_id ?? null;
-        $this->_template_args['txn_page_obj'] = isset($this->core_config->txn_page_id)
-            ? get_post($this->core_config->txn_page_id)
-            : false;
-
-        $this->_template_args['thank_you_page_id']  = $this->core_config->thank_you_page_id ?? null;
-        $this->_template_args['thank_you_page_obj'] = isset($this->core_config->thank_you_page_id)
-            ? get_post($this->core_config->thank_you_page_id)
-            : false;
-
-        $this->_template_args['cancel_page_id']  = $this->core_config->cancel_page_id ?? null;
-        $this->_template_args['cancel_page_obj'] = isset($this->core_config->cancel_page_id)
-            ? get_post($this->core_config->cancel_page_id)
-            : false;
-
-        $this->_set_add_edit_form_tags('update_espresso_page_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Handler for updating espresso page settings.
-     *
-     * @throws EE_Error
-     */
-    protected function _update_espresso_page_settings()
-    {
-        // capture incoming request data && set page IDs
-        $this->core_config->reg_page_id       = $this->request->getRequestParam(
-            'reg_page_id',
-            $this->core_config->reg_page_id,
-            DataType::INT
-        );
-        $this->core_config->txn_page_id       = $this->request->getRequestParam(
-            'txn_page_id',
-            $this->core_config->txn_page_id,
-            DataType::INT
-        );
-        $this->core_config->thank_you_page_id = $this->request->getRequestParam(
-            'thank_you_page_id',
-            $this->core_config->thank_you_page_id,
-            DataType::INT
-        );
-        $this->core_config->cancel_page_id    = $this->request->getRequestParam(
-            'cancel_page_id',
-            $this->core_config->cancel_page_id,
-            DataType::INT
-        );
-
-        $this->core_config = apply_filters(
-            'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
-            $this->core_config,
-            $this->request->requestParams()
-        );
-
-        $what = esc_html__('Critical Pages & Shortcodes', 'event_espresso');
-        $this->_redirect_after_action(
-            $this->_update_espresso_configuration(
-                $what,
-                $this->core_config,
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            ),
-            $what,
-            '',
-            [
-                'action' => 'critical_pages',
-            ],
-            true
-        );
-    }
-
-
-    /*************        Your Organization        *************/
-
-
-    /**
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _your_organization_settings()
-    {
-        $this->_template_args['admin_page_content'] = '';
-        try {
-            /** @var OrganizationSettings $organization_settings_form */
-            $organization_settings_form = $this->loader->getShared(OrganizationSettings::class);
-
-            $this->_template_args['admin_page_content'] = EEH_HTML::div(
-                $organization_settings_form->display(),
-                '',
-                'padding'
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_set_add_edit_form_tags('update_your_organization_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Handler for updating organization settings.
-     *
-     * @throws EE_Error
-     */
-    protected function _update_your_organization_settings()
-    {
-        try {
-            /** @var OrganizationSettings $organization_settings_form */
-            $organization_settings_form = $this->loader->getShared(OrganizationSettings::class);
-
-            $success = $organization_settings_form->process($this->request->requestParams());
-
-            EE_Registry::instance()->CFG = apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
-                EE_Registry::instance()->CFG
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            $success = false;
-        }
-
-        if ($success) {
-            $success = $this->_update_espresso_configuration(
-                esc_html__('Your Organization Settings', 'event_espresso'),
-                EE_Registry::instance()->CFG,
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-
-        $this->_redirect_after_action($success, '', '', ['action' => 'default'], true);
-    }
-
-
-
-    /*************        Admin Options        *************/
-
-
-    /**
-     * _admin_option_settings
-     *
-     * @throws EE_Error
-     * @throws LogicException
-     */
-    protected function _admin_option_settings()
-    {
-        $this->_template_args['admin_page_content'] = '';
-        try {
-            $admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
-            // still need this for the old school form in Extend_General_Settings_Admin_Page
-            $this->_template_args['values'] = $this->_yes_no_values;
-            // also need to account for the do_action that was in the old template
-            $admin_options_settings_form->setTemplateArgs($this->_template_args);
-            $this->_template_args['admin_page_content'] = $admin_options_settings_form->display();
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_set_add_edit_form_tags('update_admin_option_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * _update_admin_option_settings
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormSubmissionException
-     * @throws InvalidArgumentException
-     * @throws LogicException
-     */
-    protected function _update_admin_option_settings()
-    {
-        try {
-            $admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
-            $admin_options_settings_form->process(
-                $this->request->getRequestParam(
-                    $admin_options_settings_form->slug(),
-                    [],
-                    DataType::OBJECT, // need to change this to ARRAY after min PHP version gets bumped to 7+
-                    true
-                )
-            );
-            EE_Registry::instance()->CFG->admin = apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
-                EE_Registry::instance()->CFG->admin
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_redirect_after_action(
-            apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
-                $this->_update_espresso_configuration(
-                    esc_html__('Admin Options', 'event_espresso'),
-                    EE_Registry::instance()->CFG->admin,
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                )
-            ),
-            esc_html__('Admin Options', 'event_espresso'),
-            'updated',
-            ['action' => 'admin_option_settings']
-        );
-    }
-
-
-    /*************        Countries        *************/
-
-
-    /**
-     * @param string|null $default
-     * @return string
-     */
-    protected function getCountryISO(?string $default = null): string
-    {
-        $default = $default ?? $this->getCountryIsoForSite();
-        $CNT_ISO = $this->request->getRequestParam('country', $default);
-        $CNT_ISO = $this->request->getRequestParam('CNT_ISO', $CNT_ISO);
-        return strtoupper($CNT_ISO);
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getCountryIsoForSite(): string
-    {
-        return ! empty(EE_Registry::instance()->CFG->organization->CNT_ISO)
-            ? EE_Registry::instance()->CFG->organization->CNT_ISO
-            : 'US';
-    }
-
-
-    /**
-     * @param string          $CNT_ISO
-     * @param EE_Country|null $country
-     * @return EE_Base_Class|EE_Country
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function verifyOrGetCountryFromIso(string $CNT_ISO, ?EE_Country $country = null)
-    {
-        /** @var EE_Country $country */
-        return $country instanceof EE_Country && $country->ID() === $CNT_ISO
-            ? $country
-            : EEM_Country::instance()->get_one_by_ID($CNT_ISO);
-    }
-
-
-    /**
-     * Output Country Settings view.
-     *
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _country_settings()
-    {
-        $CNT_ISO = $this->getCountryISO();
-
-        $this->_template_args['values']    = $this->_yes_no_values;
-        $this->_template_args['countries'] = new EE_Question_Form_Input(
-            EE_Question::new_instance(
-                [
-                    'QST_ID'           => 0,
-                    'QST_display_text' => esc_html__('Select Country', 'event_espresso'),
-                    'QST_system'       => 'admin-country',
-                ]
-            ),
-            EE_Answer::new_instance(
-                [
-                    'ANS_ID'    => 0,
-                    'ANS_value' => $CNT_ISO,
-                ]
-            ),
-            [
-                'input_id'       => 'country',
-                'input_name'     => 'country',
-                'input_prefix'   => '',
-                'append_qstn_id' => false,
-            ]
-        );
-
-        $country = $this->verifyOrGetCountryFromIso($CNT_ISO);
-        add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10);
-        add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10);
-        $this->_template_args['country_details_settings'] = $this->display_country_settings(
-            $country->ID(),
-            $country
-        );
-        $this->_template_args['country_states_settings']  = $this->display_country_states(
-            $country->ID(),
-            $country
-        );
-        $this->_template_args['CNT_name_for_site']        = $country->name();
-
-        $this->_set_add_edit_form_tags('update_country_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_no_sidebar();
-    }
-
-
-    /**
-     * @param string          $CNT_ISO
-     * @param EE_Country|null $country
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function display_country_settings(string $CNT_ISO = '', ?EE_Country $country = null): string
-    {
-        $CNT_ISO          = $this->getCountryISO($CNT_ISO);
-        $CNT_ISO_for_site = $this->getCountryIsoForSite();
-
-        if (! $CNT_ISO) {
-            return '';
-        }
-
-        // for ajax
-        remove_all_filters('FHEE__EEH_Form_Fields__label_html');
-        remove_all_filters('FHEE__EEH_Form_Fields__input_html');
-        add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10, 2);
-        $country                                  = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
-        $CNT_cur_disabled                         = $CNT_ISO !== $CNT_ISO_for_site;
-        $this->_template_args['CNT_cur_disabled'] = $CNT_cur_disabled;
-
-        $country_input_types            = [
-            'CNT_active'      => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true,
-            ],
-            'CNT_ISO'         => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            'CNT_ISO3'        => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            // 'RGN_ID'          => [
-            //     'type'       => 'TEXT',
-            //     'input_name' => 'cntry[' . $CNT_ISO . ']',
-            //     'class'      => 'ee-input-size--small',
-            // ],
-            'CNT_name'        => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'regular-text',
-            ],
-            'CNT_cur_code'    => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_single'  => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'medium-text',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_plural'  => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'medium-text',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_sign'    => [
-                'type'         => 'TEXT',
-                'input_name'   => 'cntry[' . $CNT_ISO . ']',
-                'class'        => 'small-text',
-                'htmlentities' => false,
-                'disabled'     => $CNT_cur_disabled,
-            ],
-            'CNT_cur_sign_b4' => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_cur_dec_plc' => [
-                'type'       => 'RADIO_BTN',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => '',
-                'options'    => [
-                    ['id' => 0, 'text' => ''],
-                    ['id' => 1, 'text' => ''],
-                    ['id' => 2, 'text' => ''],
-                    ['id' => 3, 'text' => ''],
-                ],
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_dec_mrk' => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => [
-                    [
-                        'id'   => ',',
-                        'text' => esc_html__(', (comma)', 'event_espresso'),
-                    ],
-                    ['id' => '.', 'text' => esc_html__('. (decimal)', 'event_espresso')],
-                ],
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_cur_thsnds'  => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => [
-                    [
-                        'id'   => ',',
-                        'text' => esc_html__(', (comma)', 'event_espresso'),
-                    ],
-                    [
-                        'id'   => '.',
-                        'text' => esc_html__('. (decimal)', 'event_espresso'),
-                    ],
-                    [
-                        'id'   => ' ',
-                        'text' => esc_html__('(space)', 'event_espresso'),
-                    ],
-                    [
-                        'id'   => '_',
-                        'text' => esc_html__('_ (underscore)', 'event_espresso'),
-                    ],
-                    [
-                        'id'   => "'",
-                        'text' => esc_html__("' (apostrophe)", 'event_espresso'),
-                    ],
-                ],
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_tel_code'    => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            'CNT_is_EU'       => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true,
-            ],
-        ];
-        $this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object(
-            $country,
-            $country_input_types
-        );
-        $country_details_settings       = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
-            $this->_template_args,
-            true
-        );
-
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(
-                [
-                    'return_data' => $country_details_settings,
-                    'success'     => $notices['success'],
-                    'errors'      => $notices['errors'],
-                ]
-            );
-            die();
-        }
-        return $country_details_settings;
-    }
-
-
-    /**
-     * @param string          $CNT_ISO
-     * @param EE_Country|null $country
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function display_country_states(string $CNT_ISO = '', ?EE_Country $country = null): string
-    {
-        $CNT_ISO = $this->getCountryISO($CNT_ISO);
-        if (! $CNT_ISO) {
-            return '';
-        }
-        // for ajax
-        remove_all_filters('FHEE__EEH_Form_Fields__label_html');
-        remove_all_filters('FHEE__EEH_Form_Fields__input_html');
-        add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'state_form_field_label_wrap'], 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'state_form_field_input__wrap'], 10);
-        $states = EEM_State::instance()->get_all_states_for_these_countries([$CNT_ISO => $CNT_ISO]);
-        if (empty($states)) {
-            /** @var EventEspresso\core\services\address\CountrySubRegionDao $countrySubRegionDao */
-            $countrySubRegionDao = $this->loader->getShared(
-                'EventEspresso\core\services\address\CountrySubRegionDao'
-            );
-            if ($countrySubRegionDao instanceof EventEspresso\core\services\address\CountrySubRegionDao) {
-                $country = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
-                if ($countrySubRegionDao->saveCountrySubRegions($country)) {
-                    $states = EEM_State::instance()->get_all_states_for_these_countries([$CNT_ISO => $CNT_ISO]);
-                }
-            }
-        }
-        if (is_array($states)) {
-            foreach ($states as $STA_ID => $state) {
-                if ($state instanceof EE_State) {
-                    $inputs = EE_Question_Form_Input::generate_question_form_inputs_for_object(
-                        $state,
-                        [
-                            'STA_abbrev' => [
-                                'type'             => 'TEXT',
-                                'label'            => esc_html__('Code', 'event_espresso'),
-                                'input_name'       => 'states[' . $STA_ID . ']',
-                                'class'            => 'small-text',
-                                'add_mobile_label' => true,
-                            ],
-                            'STA_name'   => [
-                                'type'             => 'TEXT',
-                                'label'            => esc_html__('Name', 'event_espresso'),
-                                'input_name'       => 'states[' . $STA_ID . ']',
-                                'class'            => 'regular-text',
-                                'add_mobile_label' => true,
-                            ],
-                            'STA_active' => [
-                                'type'             => 'RADIO_BTN',
-                                'label'            => esc_html__(
-                                    'State Appears in Dropdown Select Lists',
-                                    'event_espresso'
-                                ),
-                                'input_name'       => 'states[' . $STA_ID . ']',
-                                'options'          => $this->_yes_no_values,
-                                'use_desc_4_label' => true,
-                                'add_mobile_label' => true,
-                            ],
-                        ]
-                    );
-
-                    $delete_state_url = EE_Admin_Page::add_query_args_and_nonce(
-                        [
-                            'action'     => 'delete_state',
-                            'STA_ID'     => $STA_ID,
-                            'CNT_ISO'    => $CNT_ISO,
-                            'STA_abbrev' => $state->abbrev(),
-                        ],
-                        GEN_SET_ADMIN_URL
-                    );
-
-                    $this->_template_args['states'][ $STA_ID ]['inputs']           = $inputs;
-                    $this->_template_args['states'][ $STA_ID ]['delete_state_url'] = $delete_state_url;
-                }
-            }
-        } else {
-            $this->_template_args['states'] = false;
-        }
-
-        $this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'add_new_state'],
-            GEN_SET_ADMIN_URL
-        );
-
-        $state_details_settings = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
-            $this->_template_args,
-            true
-        );
-
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(
-                [
-                    'return_data' => $state_details_settings,
-                    'success'     => $notices['success'],
-                    'errors'      => $notices['errors'],
-                ]
-            );
-            die();
-        }
-        return $state_details_settings;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function add_new_state()
-    {
-        $success = true;
-        $CNT_ISO = $this->getCountryISO('');
-        if (! $CNT_ISO) {
-            EE_Error::add_error(
-                esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $success = false;
-        }
-        $STA_abbrev = $this->request->getRequestParam('STA_abbrev');
-        if (! $STA_abbrev) {
-            EE_Error::add_error(
-                esc_html__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $success = false;
-        }
-        $STA_name = $this->request->getRequestParam('STA_name');
-        if (! $STA_name) {
-            EE_Error::add_error(
-                esc_html__('No State name or an invalid State name was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $success = false;
-        }
-
-        if ($success) {
-            $cols_n_values = [
-                'CNT_ISO'    => $CNT_ISO,
-                'STA_abbrev' => $STA_abbrev,
-                'STA_name'   => $STA_name,
-                'STA_active' => true,
-            ];
-            $success       = EEM_State::instance()->insert($cols_n_values);
-            EE_Error::add_success(esc_html__('The State was added successfully.', 'event_espresso'));
-        }
-
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(array_merge($notices, ['return_data' => $CNT_ISO]));
-            die();
-        } else {
-            $this->_redirect_after_action(
-                $success,
-                esc_html__('State', 'event_espresso'),
-                'added',
-                ['action' => 'country_settings']
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function delete_state()
-    {
-        $CNT_ISO    = $this->getCountryISO();
-        $STA_ID     = $this->request->getRequestParam('STA_ID');
-        $STA_abbrev = $this->request->getRequestParam('STA_abbrev');
-
-        if (! $STA_ID) {
-            EE_Error::add_error(
-                esc_html__('No State ID or an invalid State ID was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return;
-        }
-
-        $success = EEM_State::instance()->delete_by_ID($STA_ID);
-        if ($success !== false) {
-            do_action(
-                'AHEE__General_Settings_Admin_Page__delete_state__state_deleted',
-                $CNT_ISO,
-                $STA_ID,
-                ['STA_abbrev' => $STA_abbrev]
-            );
-            EE_Error::add_success(esc_html__('The State was deleted successfully.', 'event_espresso'));
-        }
-        if (defined('DOING_AJAX')) {
-            $notices                = EE_Error::get_notices(false);
-            $notices['return_data'] = true;
-            echo wp_json_encode($notices);
-            die();
-        } else {
-            $this->_redirect_after_action(
-                $success,
-                esc_html__('State', 'event_espresso'),
-                'deleted',
-                ['action' => 'country_settings']
-            );
-        }
-    }
-
-
-    /**
-     *        _update_country_settings
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _update_country_settings()
-    {
-        $CNT_ISO = $this->getCountryISO();
-        if (! $CNT_ISO) {
-            EE_Error::add_error(
-                esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return;
-        }
-
-        $country = $this->verifyOrGetCountryFromIso($CNT_ISO);
-
-        $cols_n_values                    = [];
-        $cols_n_values['CNT_ISO3']        = strtoupper(
-            $this->request->getRequestParam(
-                "cntry[$CNT_ISO][CNT_ISO3]",
-                $country->ISO3()
-            )
-        );
-        $cols_n_values['CNT_name']        = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_name]",
-            $country->name()
-        );
-        $cols_n_values['CNT_cur_code']    = strtoupper(
-            $this->request->getRequestParam(
-                "cntry[$CNT_ISO][CNT_cur_code]",
-                $country->currency_code()
-            )
-        );
-        $cols_n_values['CNT_cur_single']  = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_single]",
-            $country->currency_name_single()
-        );
-        $cols_n_values['CNT_cur_plural']  = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_plural]",
-            $country->currency_name_plural()
-        );
-        $cols_n_values['CNT_cur_sign']    = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_sign]",
-            $country->currency_sign()
-        );
-        $cols_n_values['CNT_cur_sign_b4'] = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_sign_b4]",
-            $country->currency_sign_before(),
-            DataType::BOOL
-        );
-        $cols_n_values['CNT_cur_dec_plc'] = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_dec_plc]",
-            $country->currency_decimal_places()
-        );
-        $cols_n_values['CNT_cur_dec_mrk'] = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_dec_mrk]",
-            $country->currency_decimal_mark()
-        );
-        $cols_n_values['CNT_cur_thsnds']  = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_cur_thsnds]",
-            $country->currency_thousands_separator()
-        );
-        $cols_n_values['CNT_tel_code']    = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_tel_code]",
-            $country->telephoneCode()
-        );
-        $cols_n_values['CNT_active']      = $this->request->getRequestParam(
-            "cntry[$CNT_ISO][CNT_active]",
-            $country->isActive(),
-            DataType::BOOL
-        );
-
-        // allow filtering of country data
-        $cols_n_values = apply_filters(
-            'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values',
-            $cols_n_values
-        );
-
-        // where values
-        $where_cols_n_values = [['CNT_ISO' => $CNT_ISO]];
-        // run the update
-        $success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
-
-        // allow filtering of states data
-        $states = apply_filters(
-            'FHEE__General_Settings_Admin_Page___update_country_settings__states',
-            $this->request->getRequestParam('states', [], DataType::STRING, true)
-        );
-
-        if (! empty($states) && $success !== false) {
-            // loop thru state data ( looks like : states[75][STA_name] )
-            foreach ($states as $STA_ID => $state) {
-                $cols_n_values = [
-                    'CNT_ISO'    => $CNT_ISO,
-                    'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
-                    'STA_name'   => sanitize_text_field($state['STA_name']),
-                    'STA_active' => filter_var($state['STA_active'], FILTER_VALIDATE_BOOLEAN),
-                ];
-                // where values
-                $where_cols_n_values = [['STA_ID' => $STA_ID]];
-                // run the update
-                $success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
-                if ($success !== false) {
-                    do_action(
-                        'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved',
-                        $CNT_ISO,
-                        $STA_ID,
-                        $cols_n_values
-                    );
-                }
-            }
-        }
-        // check if country being edited matches org option country, and if so, then  update EE_Config with new settings
-        if (
-            isset(EE_Registry::instance()->CFG->organization->CNT_ISO)
-            && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO
-        ) {
-            EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
-            EE_Registry::instance()->CFG->update_espresso_config();
-        }
-
-        if ($success !== false) {
-            EE_Error::add_success(
-                esc_html__('Country Settings updated successfully.', 'event_espresso')
-            );
-        }
-        $this->_redirect_after_action(
-            $success,
-            '',
-            '',
-            ['action' => 'country_settings', 'country' => $CNT_ISO],
-            true
-        );
-    }
-
-
-    /**
-     * form_form_field_label_wrap
-     *
-     * @param string $label
-     * @return string
-     */
-    public function country_form_field_label_wrap(string $label): string
-    {
-        return '
+	/**
+	 * @var EE_Core_Config
+	 */
+	public $core_config;
+
+
+	/**
+	 * Initialize basic properties.
+	 */
+	protected function _init_page_props()
+	{
+		$this->page_slug        = GEN_SET_PG_SLUG;
+		$this->page_label       = GEN_SET_LABEL;
+		$this->_admin_base_url  = GEN_SET_ADMIN_URL;
+		$this->_admin_base_path = GEN_SET_ADMIN;
+
+		$this->core_config = EE_Registry::instance()->CFG->core;
+	}
+
+
+	/**
+	 * Set ajax hooks
+	 */
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_espresso_display_country_settings', [$this, 'display_country_settings']);
+		add_action('wp_ajax_espresso_display_country_states', [$this, 'display_country_states']);
+		add_action('wp_ajax_espresso_delete_state', [$this, 'delete_state'], 10, 3);
+		add_action('wp_ajax_espresso_add_new_state', [$this, 'add_new_state']);
+	}
+
+
+	/**
+	 * More page properties initialization.
+	 */
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = GEN_SET_LABEL;
+		$this->_labels           = ['publishbox' => esc_html__('Update Settings', 'event_espresso')];
+	}
+
+
+	/**
+	 * Set page routes property.
+	 */
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = [
+			'critical_pages'                => [
+				'func'       => [$this, '_espresso_page_settings'],
+				'capability' => 'manage_options',
+			],
+			'update_espresso_page_settings' => [
+				'func'       => [$this, '_update_espresso_page_settings'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'default'                       => [
+				'func'       => [$this, '_your_organization_settings'],
+				'capability' => 'manage_options',
+			],
+
+			'update_your_organization_settings' => [
+				'func'       => [$this, '_update_your_organization_settings'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'admin_option_settings' => [
+				'func'       => [$this, '_admin_option_settings'],
+				'capability' => 'manage_options',
+			],
+
+			'update_admin_option_settings' => [
+				'func'       => [$this, '_update_admin_option_settings'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'country_settings' => [
+				'func'       => [$this, '_country_settings'],
+				'capability' => 'manage_options',
+			],
+
+			'update_country_settings' => [
+				'func'       => [$this, '_update_country_settings'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'display_country_settings' => [
+				'func'       => [$this, 'display_country_settings'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'add_new_state' => [
+				'func'       => [$this, 'add_new_state'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'delete_state'            => [
+				'func'       => [$this, 'delete_state'],
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'privacy_settings'        => [
+				'func'       => [$this, 'privacySettings'],
+				'capability' => 'manage_options',
+			],
+			'update_privacy_settings' => [
+				'func'               => [$this, 'updatePrivacySettings'],
+				'capability'         => 'manage_options',
+				'noheader'           => true,
+				'headers_sent_route' => 'privacy_settings',
+			],
+		];
+	}
+
+
+	/**
+	 * Set page configuration property
+	 */
+	protected function _set_page_config()
+	{
+		$this->_page_config = [
+			'critical_pages'        => [
+				'nav'           => [
+					'label' => esc_html__('Critical Pages', 'event_espresso'),
+					'order' => 50,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_critical_pages_help_tab' => [
+						'title'    => esc_html__('Critical Pages', 'event_espresso'),
+						'filename' => 'general_settings_critical_pages',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'default'               => [
+				'nav'           => [
+					'label' => esc_html__('Your Organization', 'event_espresso'),
+					'order' => 20,
+				],
+				'help_tabs'     => [
+					'general_settings_your_organization_help_tab' => [
+						'title'    => esc_html__('Your Organization', 'event_espresso'),
+						'filename' => 'general_settings_your_organization',
+					],
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'require_nonce' => false,
+			],
+			'admin_option_settings' => [
+				'nav'           => [
+					'label' => esc_html__('Admin Options', 'event_espresso'),
+					'order' => 60,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_admin_options_help_tab' => [
+						'title'    => esc_html__('Admin Options', 'event_espresso'),
+						'filename' => 'general_settings_admin_options',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'country_settings'      => [
+				'nav'           => [
+					'label' => esc_html__('Countries', 'event_espresso'),
+					'order' => 70,
+				],
+				'help_tabs'     => [
+					'general_settings_countries_help_tab' => [
+						'title'    => esc_html__('Countries', 'event_espresso'),
+						'filename' => 'general_settings_countries',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'privacy_settings'      => [
+				'nav'           => [
+					'label' => esc_html__('Privacy', 'event_espresso'),
+					'order' => 80,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'require_nonce' => false,
+			],
+		];
+	}
+
+
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	/**
+	 * Enqueue global scripts and styles for all routes in the General Settings Admin Pages.
+	 */
+	public function load_scripts_styles()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		// scripts
+		wp_enqueue_script('ee_admin_js');
+	}
+
+
+	/**
+	 * Execute logic running on `admin_init`
+	 */
+	public function admin_init()
+	{
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = wp_strip_all_tags(
+			esc_html__(
+				'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
+				'event_espresso'
+			)
+		);
+		EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(
+			esc_html__(
+				'An error occurred! Please refresh the page and try again.',
+				'event_espresso'
+			)
+		);
+		EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(
+			esc_html__(
+				'Are you sure you want to delete this State / Province?',
+				'event_espresso'
+			)
+		);
+		EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
+			'admin-ajax.php?page=espresso_general_settings',
+			is_ssl() ? 'https://' : 'http://'
+		);
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the default route.
+	 */
+	public function load_scripts_styles_default()
+	{
+		// styles
+		wp_enqueue_style('thickbox');
+		// scripts
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('thickbox');
+		wp_register_script(
+			'organization_settings',
+			GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+			['jquery', 'media-upload', 'thickbox'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('organization_settings');
+		wp_enqueue_style('organization-css');
+		$confirm_image_delete = [
+			'text' => wp_strip_all_tags(
+				esc_html__(
+					'Do you really want to delete this image? Please remember to save your settings to complete the removal.',
+					'event_espresso'
+				)
+			),
+		];
+		wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the country settings route.
+	 */
+	public function load_scripts_styles_country_settings()
+	{
+		// scripts
+		wp_register_script(
+			'gen_settings_countries',
+			GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+			['ee_admin_js'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('gen_settings_countries');
+		wp_enqueue_style('organization-css');
+	}
+
+
+	/*************        Espresso Pages        *************/
+	/**
+	 * _espresso_page_settings
+	 *
+	 * @throws EE_Error
+	 * @throws DomainException
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	protected function _espresso_page_settings()
+	{
+		// Check to make sure all of the main pages are set up properly,
+		// if not create the default pages and display an admin notice
+		EEH_Activation::verify_default_pages_exist();
+		$this->_transient_garbage_collection();
+
+		$this->_template_args['values'] = $this->_yes_no_values;
+
+		$this->_template_args['reg_page_id']  = $this->core_config->reg_page_id ?? null;
+		$this->_template_args['reg_page_obj'] = isset($this->core_config->reg_page_id)
+			? get_post($this->core_config->reg_page_id)
+			: false;
+
+		$this->_template_args['txn_page_id']  = $this->core_config->txn_page_id ?? null;
+		$this->_template_args['txn_page_obj'] = isset($this->core_config->txn_page_id)
+			? get_post($this->core_config->txn_page_id)
+			: false;
+
+		$this->_template_args['thank_you_page_id']  = $this->core_config->thank_you_page_id ?? null;
+		$this->_template_args['thank_you_page_obj'] = isset($this->core_config->thank_you_page_id)
+			? get_post($this->core_config->thank_you_page_id)
+			: false;
+
+		$this->_template_args['cancel_page_id']  = $this->core_config->cancel_page_id ?? null;
+		$this->_template_args['cancel_page_obj'] = isset($this->core_config->cancel_page_id)
+			? get_post($this->core_config->cancel_page_id)
+			: false;
+
+		$this->_set_add_edit_form_tags('update_espresso_page_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Handler for updating espresso page settings.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _update_espresso_page_settings()
+	{
+		// capture incoming request data && set page IDs
+		$this->core_config->reg_page_id       = $this->request->getRequestParam(
+			'reg_page_id',
+			$this->core_config->reg_page_id,
+			DataType::INT
+		);
+		$this->core_config->txn_page_id       = $this->request->getRequestParam(
+			'txn_page_id',
+			$this->core_config->txn_page_id,
+			DataType::INT
+		);
+		$this->core_config->thank_you_page_id = $this->request->getRequestParam(
+			'thank_you_page_id',
+			$this->core_config->thank_you_page_id,
+			DataType::INT
+		);
+		$this->core_config->cancel_page_id    = $this->request->getRequestParam(
+			'cancel_page_id',
+			$this->core_config->cancel_page_id,
+			DataType::INT
+		);
+
+		$this->core_config = apply_filters(
+			'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
+			$this->core_config,
+			$this->request->requestParams()
+		);
+
+		$what = esc_html__('Critical Pages & Shortcodes', 'event_espresso');
+		$this->_redirect_after_action(
+			$this->_update_espresso_configuration(
+				$what,
+				$this->core_config,
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			),
+			$what,
+			'',
+			[
+				'action' => 'critical_pages',
+			],
+			true
+		);
+	}
+
+
+	/*************        Your Organization        *************/
+
+
+	/**
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _your_organization_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			/** @var OrganizationSettings $organization_settings_form */
+			$organization_settings_form = $this->loader->getShared(OrganizationSettings::class);
+
+			$this->_template_args['admin_page_content'] = EEH_HTML::div(
+				$organization_settings_form->display(),
+				'',
+				'padding'
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_your_organization_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Handler for updating organization settings.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _update_your_organization_settings()
+	{
+		try {
+			/** @var OrganizationSettings $organization_settings_form */
+			$organization_settings_form = $this->loader->getShared(OrganizationSettings::class);
+
+			$success = $organization_settings_form->process($this->request->requestParams());
+
+			EE_Registry::instance()->CFG = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
+				EE_Registry::instance()->CFG
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			$success = false;
+		}
+
+		if ($success) {
+			$success = $this->_update_espresso_configuration(
+				esc_html__('Your Organization Settings', 'event_espresso'),
+				EE_Registry::instance()->CFG,
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+
+		$this->_redirect_after_action($success, '', '', ['action' => 'default'], true);
+	}
+
+
+
+	/*************        Admin Options        *************/
+
+
+	/**
+	 * _admin_option_settings
+	 *
+	 * @throws EE_Error
+	 * @throws LogicException
+	 */
+	protected function _admin_option_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			// still need this for the old school form in Extend_General_Settings_Admin_Page
+			$this->_template_args['values'] = $this->_yes_no_values;
+			// also need to account for the do_action that was in the old template
+			$admin_options_settings_form->setTemplateArgs($this->_template_args);
+			$this->_template_args['admin_page_content'] = $admin_options_settings_form->display();
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_admin_option_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * _update_admin_option_settings
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormSubmissionException
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 */
+	protected function _update_admin_option_settings()
+	{
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			$admin_options_settings_form->process(
+				$this->request->getRequestParam(
+					$admin_options_settings_form->slug(),
+					[],
+					DataType::OBJECT, // need to change this to ARRAY after min PHP version gets bumped to 7+
+					true
+				)
+			);
+			EE_Registry::instance()->CFG->admin = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+				EE_Registry::instance()->CFG->admin
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_redirect_after_action(
+			apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
+				$this->_update_espresso_configuration(
+					esc_html__('Admin Options', 'event_espresso'),
+					EE_Registry::instance()->CFG->admin,
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				)
+			),
+			esc_html__('Admin Options', 'event_espresso'),
+			'updated',
+			['action' => 'admin_option_settings']
+		);
+	}
+
+
+	/*************        Countries        *************/
+
+
+	/**
+	 * @param string|null $default
+	 * @return string
+	 */
+	protected function getCountryISO(?string $default = null): string
+	{
+		$default = $default ?? $this->getCountryIsoForSite();
+		$CNT_ISO = $this->request->getRequestParam('country', $default);
+		$CNT_ISO = $this->request->getRequestParam('CNT_ISO', $CNT_ISO);
+		return strtoupper($CNT_ISO);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getCountryIsoForSite(): string
+	{
+		return ! empty(EE_Registry::instance()->CFG->organization->CNT_ISO)
+			? EE_Registry::instance()->CFG->organization->CNT_ISO
+			: 'US';
+	}
+
+
+	/**
+	 * @param string          $CNT_ISO
+	 * @param EE_Country|null $country
+	 * @return EE_Base_Class|EE_Country
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function verifyOrGetCountryFromIso(string $CNT_ISO, ?EE_Country $country = null)
+	{
+		/** @var EE_Country $country */
+		return $country instanceof EE_Country && $country->ID() === $CNT_ISO
+			? $country
+			: EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+	}
+
+
+	/**
+	 * Output Country Settings view.
+	 *
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _country_settings()
+	{
+		$CNT_ISO = $this->getCountryISO();
+
+		$this->_template_args['values']    = $this->_yes_no_values;
+		$this->_template_args['countries'] = new EE_Question_Form_Input(
+			EE_Question::new_instance(
+				[
+					'QST_ID'           => 0,
+					'QST_display_text' => esc_html__('Select Country', 'event_espresso'),
+					'QST_system'       => 'admin-country',
+				]
+			),
+			EE_Answer::new_instance(
+				[
+					'ANS_ID'    => 0,
+					'ANS_value' => $CNT_ISO,
+				]
+			),
+			[
+				'input_id'       => 'country',
+				'input_name'     => 'country',
+				'input_prefix'   => '',
+				'append_qstn_id' => false,
+			]
+		);
+
+		$country = $this->verifyOrGetCountryFromIso($CNT_ISO);
+		add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10);
+		add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10);
+		$this->_template_args['country_details_settings'] = $this->display_country_settings(
+			$country->ID(),
+			$country
+		);
+		$this->_template_args['country_states_settings']  = $this->display_country_states(
+			$country->ID(),
+			$country
+		);
+		$this->_template_args['CNT_name_for_site']        = $country->name();
+
+		$this->_set_add_edit_form_tags('update_country_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * @param string          $CNT_ISO
+	 * @param EE_Country|null $country
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function display_country_settings(string $CNT_ISO = '', ?EE_Country $country = null): string
+	{
+		$CNT_ISO          = $this->getCountryISO($CNT_ISO);
+		$CNT_ISO_for_site = $this->getCountryIsoForSite();
+
+		if (! $CNT_ISO) {
+			return '';
+		}
+
+		// for ajax
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10, 2);
+		$country                                  = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
+		$CNT_cur_disabled                         = $CNT_ISO !== $CNT_ISO_for_site;
+		$this->_template_args['CNT_cur_disabled'] = $CNT_cur_disabled;
+
+		$country_input_types            = [
+			'CNT_active'      => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true,
+			],
+			'CNT_ISO'         => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			'CNT_ISO3'        => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			// 'RGN_ID'          => [
+			//     'type'       => 'TEXT',
+			//     'input_name' => 'cntry[' . $CNT_ISO . ']',
+			//     'class'      => 'ee-input-size--small',
+			// ],
+			'CNT_name'        => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'regular-text',
+			],
+			'CNT_cur_code'    => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_single'  => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'medium-text',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_plural'  => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'medium-text',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_sign'    => [
+				'type'         => 'TEXT',
+				'input_name'   => 'cntry[' . $CNT_ISO . ']',
+				'class'        => 'small-text',
+				'htmlentities' => false,
+				'disabled'     => $CNT_cur_disabled,
+			],
+			'CNT_cur_sign_b4' => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_cur_dec_plc' => [
+				'type'       => 'RADIO_BTN',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => '',
+				'options'    => [
+					['id' => 0, 'text' => ''],
+					['id' => 1, 'text' => ''],
+					['id' => 2, 'text' => ''],
+					['id' => 3, 'text' => ''],
+				],
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_dec_mrk' => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => [
+					[
+						'id'   => ',',
+						'text' => esc_html__(', (comma)', 'event_espresso'),
+					],
+					['id' => '.', 'text' => esc_html__('. (decimal)', 'event_espresso')],
+				],
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_cur_thsnds'  => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => [
+					[
+						'id'   => ',',
+						'text' => esc_html__(', (comma)', 'event_espresso'),
+					],
+					[
+						'id'   => '.',
+						'text' => esc_html__('. (decimal)', 'event_espresso'),
+					],
+					[
+						'id'   => ' ',
+						'text' => esc_html__('(space)', 'event_espresso'),
+					],
+					[
+						'id'   => '_',
+						'text' => esc_html__('_ (underscore)', 'event_espresso'),
+					],
+					[
+						'id'   => "'",
+						'text' => esc_html__("' (apostrophe)", 'event_espresso'),
+					],
+				],
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_tel_code'    => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			'CNT_is_EU'       => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true,
+			],
+		];
+		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object(
+			$country,
+			$country_input_types
+		);
+		$country_details_settings       = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
+			$this->_template_args,
+			true
+		);
+
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(
+				[
+					'return_data' => $country_details_settings,
+					'success'     => $notices['success'],
+					'errors'      => $notices['errors'],
+				]
+			);
+			die();
+		}
+		return $country_details_settings;
+	}
+
+
+	/**
+	 * @param string          $CNT_ISO
+	 * @param EE_Country|null $country
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function display_country_states(string $CNT_ISO = '', ?EE_Country $country = null): string
+	{
+		$CNT_ISO = $this->getCountryISO($CNT_ISO);
+		if (! $CNT_ISO) {
+			return '';
+		}
+		// for ajax
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'state_form_field_label_wrap'], 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'state_form_field_input__wrap'], 10);
+		$states = EEM_State::instance()->get_all_states_for_these_countries([$CNT_ISO => $CNT_ISO]);
+		if (empty($states)) {
+			/** @var EventEspresso\core\services\address\CountrySubRegionDao $countrySubRegionDao */
+			$countrySubRegionDao = $this->loader->getShared(
+				'EventEspresso\core\services\address\CountrySubRegionDao'
+			);
+			if ($countrySubRegionDao instanceof EventEspresso\core\services\address\CountrySubRegionDao) {
+				$country = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
+				if ($countrySubRegionDao->saveCountrySubRegions($country)) {
+					$states = EEM_State::instance()->get_all_states_for_these_countries([$CNT_ISO => $CNT_ISO]);
+				}
+			}
+		}
+		if (is_array($states)) {
+			foreach ($states as $STA_ID => $state) {
+				if ($state instanceof EE_State) {
+					$inputs = EE_Question_Form_Input::generate_question_form_inputs_for_object(
+						$state,
+						[
+							'STA_abbrev' => [
+								'type'             => 'TEXT',
+								'label'            => esc_html__('Code', 'event_espresso'),
+								'input_name'       => 'states[' . $STA_ID . ']',
+								'class'            => 'small-text',
+								'add_mobile_label' => true,
+							],
+							'STA_name'   => [
+								'type'             => 'TEXT',
+								'label'            => esc_html__('Name', 'event_espresso'),
+								'input_name'       => 'states[' . $STA_ID . ']',
+								'class'            => 'regular-text',
+								'add_mobile_label' => true,
+							],
+							'STA_active' => [
+								'type'             => 'RADIO_BTN',
+								'label'            => esc_html__(
+									'State Appears in Dropdown Select Lists',
+									'event_espresso'
+								),
+								'input_name'       => 'states[' . $STA_ID . ']',
+								'options'          => $this->_yes_no_values,
+								'use_desc_4_label' => true,
+								'add_mobile_label' => true,
+							],
+						]
+					);
+
+					$delete_state_url = EE_Admin_Page::add_query_args_and_nonce(
+						[
+							'action'     => 'delete_state',
+							'STA_ID'     => $STA_ID,
+							'CNT_ISO'    => $CNT_ISO,
+							'STA_abbrev' => $state->abbrev(),
+						],
+						GEN_SET_ADMIN_URL
+					);
+
+					$this->_template_args['states'][ $STA_ID ]['inputs']           = $inputs;
+					$this->_template_args['states'][ $STA_ID ]['delete_state_url'] = $delete_state_url;
+				}
+			}
+		} else {
+			$this->_template_args['states'] = false;
+		}
+
+		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'add_new_state'],
+			GEN_SET_ADMIN_URL
+		);
+
+		$state_details_settings = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
+			$this->_template_args,
+			true
+		);
+
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(
+				[
+					'return_data' => $state_details_settings,
+					'success'     => $notices['success'],
+					'errors'      => $notices['errors'],
+				]
+			);
+			die();
+		}
+		return $state_details_settings;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function add_new_state()
+	{
+		$success = true;
+		$CNT_ISO = $this->getCountryISO('');
+		if (! $CNT_ISO) {
+			EE_Error::add_error(
+				esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$success = false;
+		}
+		$STA_abbrev = $this->request->getRequestParam('STA_abbrev');
+		if (! $STA_abbrev) {
+			EE_Error::add_error(
+				esc_html__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$success = false;
+		}
+		$STA_name = $this->request->getRequestParam('STA_name');
+		if (! $STA_name) {
+			EE_Error::add_error(
+				esc_html__('No State name or an invalid State name was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$success = false;
+		}
+
+		if ($success) {
+			$cols_n_values = [
+				'CNT_ISO'    => $CNT_ISO,
+				'STA_abbrev' => $STA_abbrev,
+				'STA_name'   => $STA_name,
+				'STA_active' => true,
+			];
+			$success       = EEM_State::instance()->insert($cols_n_values);
+			EE_Error::add_success(esc_html__('The State was added successfully.', 'event_espresso'));
+		}
+
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(array_merge($notices, ['return_data' => $CNT_ISO]));
+			die();
+		} else {
+			$this->_redirect_after_action(
+				$success,
+				esc_html__('State', 'event_espresso'),
+				'added',
+				['action' => 'country_settings']
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function delete_state()
+	{
+		$CNT_ISO    = $this->getCountryISO();
+		$STA_ID     = $this->request->getRequestParam('STA_ID');
+		$STA_abbrev = $this->request->getRequestParam('STA_abbrev');
+
+		if (! $STA_ID) {
+			EE_Error::add_error(
+				esc_html__('No State ID or an invalid State ID was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return;
+		}
+
+		$success = EEM_State::instance()->delete_by_ID($STA_ID);
+		if ($success !== false) {
+			do_action(
+				'AHEE__General_Settings_Admin_Page__delete_state__state_deleted',
+				$CNT_ISO,
+				$STA_ID,
+				['STA_abbrev' => $STA_abbrev]
+			);
+			EE_Error::add_success(esc_html__('The State was deleted successfully.', 'event_espresso'));
+		}
+		if (defined('DOING_AJAX')) {
+			$notices                = EE_Error::get_notices(false);
+			$notices['return_data'] = true;
+			echo wp_json_encode($notices);
+			die();
+		} else {
+			$this->_redirect_after_action(
+				$success,
+				esc_html__('State', 'event_espresso'),
+				'deleted',
+				['action' => 'country_settings']
+			);
+		}
+	}
+
+
+	/**
+	 *        _update_country_settings
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _update_country_settings()
+	{
+		$CNT_ISO = $this->getCountryISO();
+		if (! $CNT_ISO) {
+			EE_Error::add_error(
+				esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return;
+		}
+
+		$country = $this->verifyOrGetCountryFromIso($CNT_ISO);
+
+		$cols_n_values                    = [];
+		$cols_n_values['CNT_ISO3']        = strtoupper(
+			$this->request->getRequestParam(
+				"cntry[$CNT_ISO][CNT_ISO3]",
+				$country->ISO3()
+			)
+		);
+		$cols_n_values['CNT_name']        = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_name]",
+			$country->name()
+		);
+		$cols_n_values['CNT_cur_code']    = strtoupper(
+			$this->request->getRequestParam(
+				"cntry[$CNT_ISO][CNT_cur_code]",
+				$country->currency_code()
+			)
+		);
+		$cols_n_values['CNT_cur_single']  = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_single]",
+			$country->currency_name_single()
+		);
+		$cols_n_values['CNT_cur_plural']  = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_plural]",
+			$country->currency_name_plural()
+		);
+		$cols_n_values['CNT_cur_sign']    = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_sign]",
+			$country->currency_sign()
+		);
+		$cols_n_values['CNT_cur_sign_b4'] = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_sign_b4]",
+			$country->currency_sign_before(),
+			DataType::BOOL
+		);
+		$cols_n_values['CNT_cur_dec_plc'] = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_dec_plc]",
+			$country->currency_decimal_places()
+		);
+		$cols_n_values['CNT_cur_dec_mrk'] = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_dec_mrk]",
+			$country->currency_decimal_mark()
+		);
+		$cols_n_values['CNT_cur_thsnds']  = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_cur_thsnds]",
+			$country->currency_thousands_separator()
+		);
+		$cols_n_values['CNT_tel_code']    = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_tel_code]",
+			$country->telephoneCode()
+		);
+		$cols_n_values['CNT_active']      = $this->request->getRequestParam(
+			"cntry[$CNT_ISO][CNT_active]",
+			$country->isActive(),
+			DataType::BOOL
+		);
+
+		// allow filtering of country data
+		$cols_n_values = apply_filters(
+			'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values',
+			$cols_n_values
+		);
+
+		// where values
+		$where_cols_n_values = [['CNT_ISO' => $CNT_ISO]];
+		// run the update
+		$success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
+
+		// allow filtering of states data
+		$states = apply_filters(
+			'FHEE__General_Settings_Admin_Page___update_country_settings__states',
+			$this->request->getRequestParam('states', [], DataType::STRING, true)
+		);
+
+		if (! empty($states) && $success !== false) {
+			// loop thru state data ( looks like : states[75][STA_name] )
+			foreach ($states as $STA_ID => $state) {
+				$cols_n_values = [
+					'CNT_ISO'    => $CNT_ISO,
+					'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
+					'STA_name'   => sanitize_text_field($state['STA_name']),
+					'STA_active' => filter_var($state['STA_active'], FILTER_VALIDATE_BOOLEAN),
+				];
+				// where values
+				$where_cols_n_values = [['STA_ID' => $STA_ID]];
+				// run the update
+				$success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
+				if ($success !== false) {
+					do_action(
+						'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved',
+						$CNT_ISO,
+						$STA_ID,
+						$cols_n_values
+					);
+				}
+			}
+		}
+		// check if country being edited matches org option country, and if so, then  update EE_Config with new settings
+		if (
+			isset(EE_Registry::instance()->CFG->organization->CNT_ISO)
+			&& $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO
+		) {
+			EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
+			EE_Registry::instance()->CFG->update_espresso_config();
+		}
+
+		if ($success !== false) {
+			EE_Error::add_success(
+				esc_html__('Country Settings updated successfully.', 'event_espresso')
+			);
+		}
+		$this->_redirect_after_action(
+			$success,
+			'',
+			'',
+			['action' => 'country_settings', 'country' => $CNT_ISO],
+			true
+		);
+	}
+
+
+	/**
+	 * form_form_field_label_wrap
+	 *
+	 * @param string $label
+	 * @return string
+	 */
+	public function country_form_field_label_wrap(string $label): string
+	{
+		return '
 			<tr>
 				<th>
 					' . $label . '
 				</th>';
-    }
-
-
-    /**
-     * form_form_field_input__wrap
-     *
-     * @param string $input
-     * @return string
-     */
-    public function country_form_field_input__wrap(string $input): string
-    {
-        return '
+	}
+
+
+	/**
+	 * form_form_field_input__wrap
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	public function country_form_field_input__wrap(string $input): string
+	{
+		return '
 				<td class="general-settings-country-input-td">
 					' . $input . '
 				</td>
 			</tr>';
-    }
-
-
-    /**
-     * form_form_field_label_wrap
-     *
-     * @param string $label
-     * @param string $required_text
-     * @return string
-     */
-    public function state_form_field_label_wrap(string $label, string $required_text): string
-    {
-        return $required_text;
-    }
-
-
-    /**
-     * form_form_field_input__wrap
-     *
-     * @param string $input
-     * @return string
-     */
-    public function state_form_field_input__wrap(string $input): string
-    {
-        return '
+	}
+
+
+	/**
+	 * form_form_field_label_wrap
+	 *
+	 * @param string $label
+	 * @param string $required_text
+	 * @return string
+	 */
+	public function state_form_field_label_wrap(string $label, string $required_text): string
+	{
+		return $required_text;
+	}
+
+
+	/**
+	 * form_form_field_input__wrap
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	public function state_form_field_input__wrap(string $input): string
+	{
+		return '
 				<td class="general-settings-country-state-input-td">
 					' . $input . '
 				</td>';
-    }
-
-
-    /***********/
-
-
-    /**
-     * displays edit and view links for critical EE pages
-     *
-     * @param int $ee_page_id
-     * @return string
-     */
-    public static function edit_view_links(int $ee_page_id): string
-    {
-        $edit_url = add_query_arg(
-            ['post' => $ee_page_id, 'action' => 'edit'],
-            admin_url('post.php')
-        );
-        $links    = '<a href="' . esc_url_raw($edit_url) . '" >' . esc_html__('Edit', 'event_espresso') . '</a>';
-        $links    .= ' &nbsp;|&nbsp; ';
-        $links    .= '<a href="' . get_permalink($ee_page_id) . '" >' . esc_html__('View', 'event_espresso') . '</a>';
-
-        return $links;
-    }
-
-
-    /**
-     * displays page and shortcode status for critical EE pages
-     *
-     * @param WP_Post $ee_page
-     * @param string  $shortcode
-     * @return string
-     */
-    public static function page_and_shortcode_status(WP_Post $ee_page, string $shortcode): string
-    {
-        // page status
-        if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
-            $pg_colour = 'green';
-            $pg_status = sprintf(esc_html__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
-        } else {
-            $pg_colour = 'red';
-            $pg_status = sprintf(esc_html__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
-        }
-
-        // shortcode status
-        if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== false) {
-            $sc_colour = 'green';
-            $sc_status = sprintf(esc_html__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
-        } else {
-            $sc_colour = 'red';
-            $sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
-        }
-
-        return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>'
-               . $pg_status
-               . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
-    }
-
-
-    /**
-     * generates a dropdown of all parent pages - copied from WP core
-     *
-     * @param int  $default
-     * @param int  $parent
-     * @param int  $level
-     * @param bool $echo
-     * @return string;
-     */
-    public static function page_settings_dropdown(
-        int $default = 0,
-        int $parent = 0,
-        int $level = 0,
-        bool $echo = true
-    ): string {
-        global $wpdb;
-        $items  = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
-                $parent
-            )
-        );
-        $output = '';
-
-        if ($items) {
-            $level = absint($level);
-            foreach ($items as $item) {
-                $ID         = absint($item->ID);
-                $post_title = wp_strip_all_tags($item->post_title);
-                $pad        = str_repeat('&nbsp;', $level * 3);
-                $option     = "\n\t";
-                $option     .= '<option class="level-' . $level . '" ';
-                $option     .= 'value="' . $ID . '" ';
-                $option     .= $ID === absint($default) ? ' selected' : '';
-                $option     .= '>';
-                $option     .= "$pad {$post_title}";
-                $option     .= '</option>';
-                $output     .= $option;
-                ob_start();
-                parent_dropdown($default, $item->ID, $level + 1);
-                $output .= ob_get_clean();
-            }
-        }
-        if ($echo) {
-            echo wp_kses($output, AllowedTags::getWithFormTags());
-            return '';
-        }
-        return $output;
-    }
-
-
-    /**
-     * Loads the scripts for the privacy settings form
-     */
-    public function load_scripts_styles_privacy_settings()
-    {
-        $form_handler = $this->loader->getShared(
-            'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler'
-        );
-        $form_handler->enqueueStylesAndScripts();
-    }
-
-
-    /**
-     * display the privacy settings form
-     *
-     * @throws EE_Error
-     */
-    public function privacySettings()
-    {
-        $this->_set_add_edit_form_tags('update_privacy_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $form_handler                               = $this->loader->getShared(
-            'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler'
-        );
-        $this->_template_args['admin_page_content'] = EEH_HTML::div(
-            $form_handler->display(),
-            '',
-            'padding'
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Update the privacy settings from form data
-     *
-     * @throws EE_Error
-     */
-    public function updatePrivacySettings()
-    {
-        $form_handler = $this->loader->getShared(
-            'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler'
-        );
-        $success      = $form_handler->process($this->get_request_data());
-        $this->_redirect_after_action(
-            $success,
-            esc_html__('Registration Form Options', 'event_espresso'),
-            'updated',
-            ['action' => 'privacy_settings']
-        );
-    }
+	}
+
+
+	/***********/
+
+
+	/**
+	 * displays edit and view links for critical EE pages
+	 *
+	 * @param int $ee_page_id
+	 * @return string
+	 */
+	public static function edit_view_links(int $ee_page_id): string
+	{
+		$edit_url = add_query_arg(
+			['post' => $ee_page_id, 'action' => 'edit'],
+			admin_url('post.php')
+		);
+		$links    = '<a href="' . esc_url_raw($edit_url) . '" >' . esc_html__('Edit', 'event_espresso') . '</a>';
+		$links    .= ' &nbsp;|&nbsp; ';
+		$links    .= '<a href="' . get_permalink($ee_page_id) . '" >' . esc_html__('View', 'event_espresso') . '</a>';
+
+		return $links;
+	}
+
+
+	/**
+	 * displays page and shortcode status for critical EE pages
+	 *
+	 * @param WP_Post $ee_page
+	 * @param string  $shortcode
+	 * @return string
+	 */
+	public static function page_and_shortcode_status(WP_Post $ee_page, string $shortcode): string
+	{
+		// page status
+		if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
+			$pg_colour = 'green';
+			$pg_status = sprintf(esc_html__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
+		} else {
+			$pg_colour = 'red';
+			$pg_status = sprintf(esc_html__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
+		}
+
+		// shortcode status
+		if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== false) {
+			$sc_colour = 'green';
+			$sc_status = sprintf(esc_html__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
+		} else {
+			$sc_colour = 'red';
+			$sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
+		}
+
+		return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>'
+			   . $pg_status
+			   . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
+	}
+
+
+	/**
+	 * generates a dropdown of all parent pages - copied from WP core
+	 *
+	 * @param int  $default
+	 * @param int  $parent
+	 * @param int  $level
+	 * @param bool $echo
+	 * @return string;
+	 */
+	public static function page_settings_dropdown(
+		int $default = 0,
+		int $parent = 0,
+		int $level = 0,
+		bool $echo = true
+	): string {
+		global $wpdb;
+		$items  = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
+				$parent
+			)
+		);
+		$output = '';
+
+		if ($items) {
+			$level = absint($level);
+			foreach ($items as $item) {
+				$ID         = absint($item->ID);
+				$post_title = wp_strip_all_tags($item->post_title);
+				$pad        = str_repeat('&nbsp;', $level * 3);
+				$option     = "\n\t";
+				$option     .= '<option class="level-' . $level . '" ';
+				$option     .= 'value="' . $ID . '" ';
+				$option     .= $ID === absint($default) ? ' selected' : '';
+				$option     .= '>';
+				$option     .= "$pad {$post_title}";
+				$option     .= '</option>';
+				$output     .= $option;
+				ob_start();
+				parent_dropdown($default, $item->ID, $level + 1);
+				$output .= ob_get_clean();
+			}
+		}
+		if ($echo) {
+			echo wp_kses($output, AllowedTags::getWithFormTags());
+			return '';
+		}
+		return $output;
+	}
+
+
+	/**
+	 * Loads the scripts for the privacy settings form
+	 */
+	public function load_scripts_styles_privacy_settings()
+	{
+		$form_handler = $this->loader->getShared(
+			'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler'
+		);
+		$form_handler->enqueueStylesAndScripts();
+	}
+
+
+	/**
+	 * display the privacy settings form
+	 *
+	 * @throws EE_Error
+	 */
+	public function privacySettings()
+	{
+		$this->_set_add_edit_form_tags('update_privacy_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$form_handler                               = $this->loader->getShared(
+			'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler'
+		);
+		$this->_template_args['admin_page_content'] = EEH_HTML::div(
+			$form_handler->display(),
+			'',
+			'padding'
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Update the privacy settings from form data
+	 *
+	 * @throws EE_Error
+	 */
+	public function updatePrivacySettings()
+	{
+		$form_handler = $this->loader->getShared(
+			'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler'
+		);
+		$success      = $form_handler->process($this->get_request_data());
+		$this->_redirect_after_action(
+			$success,
+			esc_html__('Registration Form Options', 'event_espresso'),
+			'updated',
+			['action' => 'privacy_settings']
+		);
+	}
 }

Spacing +64 added lines, -64 removed lines

@@ -246,19 +246,19 @@ 
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(
+        EE_Registry::$i18n_js_strings['error_occurred'] = wp_strip_all_tags(
             esc_html__(
                 'An error occurred! Please refresh the page and try again.',
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(
+        EE_Registry::$i18n_js_strings['confirm_delete_state'] = wp_strip_all_tags(
             esc_html__(
                 'Are you sure you want to delete this State / Province?',
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
+        EE_Registry::$i18n_js_strings['ajax_url'] = admin_url(
             'admin-ajax.php?page=espresso_general_settings',
             is_ssl() ? 'https://' : 'http://'
         );
@@ -287,12 +287,12 @@ 
         wp_enqueue_script('thickbox');
         wp_register_script(
             'organization_settings',
-            GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+            GEN_SET_ASSETS_URL.'your_organization_settings.js',
             ['jquery', 'media-upload', 'thickbox'],
             EVENT_ESPRESSO_VERSION,
             true
         );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+        wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', [], EVENT_ESPRESSO_VERSION);
         wp_enqueue_script('organization_settings');
         wp_enqueue_style('organization-css');
         $confirm_image_delete = [
@@ -315,12 +315,12 @@ 
         // scripts
         wp_register_script(
             'gen_settings_countries',
-            GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+            GEN_SET_ASSETS_URL.'gen_settings_countries.js',
             ['ee_admin_js'],
             EVENT_ESPRESSO_VERSION,
             true
         );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+        wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', [], EVENT_ESPRESSO_VERSION);
         wp_enqueue_script('gen_settings_countries');
         wp_enqueue_style('organization-css');
     }
@@ -368,7 +368,7 @@ 
         $this->_set_add_edit_form_tags('update_espresso_page_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'espresso_page_settings.template.php',
             $this->_template_args,
             true
         );
@@ -384,12 +384,12 @@ 
     protected function _update_espresso_page_settings()
     {
         // capture incoming request data && set page IDs
-        $this->core_config->reg_page_id       = $this->request->getRequestParam(
+        $this->core_config->reg_page_id = $this->request->getRequestParam(
             'reg_page_id',
             $this->core_config->reg_page_id,
             DataType::INT
         );
-        $this->core_config->txn_page_id       = $this->request->getRequestParam(
+        $this->core_config->txn_page_id = $this->request->getRequestParam(
             'txn_page_id',
             $this->core_config->txn_page_id,
             DataType::INT
@@ -399,7 +399,7 @@ 
             $this->core_config->thank_you_page_id,
             DataType::INT
         );
-        $this->core_config->cancel_page_id    = $this->request->getRequestParam(
+        $this->core_config->cancel_page_id = $this->request->getRequestParam(
             'cancel_page_id',
             $this->core_config->cancel_page_id,
             DataType::INT
@@ -662,16 +662,16 @@ 
             $country->ID(),
             $country
         );
-        $this->_template_args['country_states_settings']  = $this->display_country_states(
+        $this->_template_args['country_states_settings'] = $this->display_country_states(
             $country->ID(),
             $country
         );
-        $this->_template_args['CNT_name_for_site']        = $country->name();
+        $this->_template_args['CNT_name_for_site'] = $country->name();
 
         $this->_set_add_edit_form_tags('update_country_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'countries_settings.template.php',
             $this->_template_args,
             true
         );
@@ -695,7 +695,7 @@ 
         $CNT_ISO          = $this->getCountryISO($CNT_ISO);
         $CNT_ISO_for_site = $this->getCountryIsoForSite();
 
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             return '';
         }
 
@@ -708,22 +708,22 @@ 
         $CNT_cur_disabled                         = $CNT_ISO !== $CNT_ISO_for_site;
         $this->_template_args['CNT_cur_disabled'] = $CNT_cur_disabled;
 
-        $country_input_types            = [
+        $country_input_types = [
             'CNT_active'      => [
                 'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
+                'input_name'       => 'cntry['.$CNT_ISO.']',
                 'class'            => '',
                 'options'          => $this->_yes_no_values,
                 'use_desc_4_label' => true,
             ],
             'CNT_ISO'         => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'small-text',
             ],
             'CNT_ISO3'        => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'small-text',
             ],
             // 'RGN_ID'          => [
@@ -733,37 +733,37 @@ 
             // ],
             'CNT_name'        => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'regular-text',
             ],
             'CNT_cur_code'    => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'small-text',
                 'disabled'   => $CNT_cur_disabled,
             ],
             'CNT_cur_single'  => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'medium-text',
                 'disabled'   => $CNT_cur_disabled,
             ],
             'CNT_cur_plural'  => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'medium-text',
                 'disabled'   => $CNT_cur_disabled,
             ],
             'CNT_cur_sign'    => [
                 'type'         => 'TEXT',
-                'input_name'   => 'cntry[' . $CNT_ISO . ']',
+                'input_name'   => 'cntry['.$CNT_ISO.']',
                 'class'        => 'small-text',
                 'htmlentities' => false,
                 'disabled'     => $CNT_cur_disabled,
             ],
             'CNT_cur_sign_b4' => [
                 'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
+                'input_name'       => 'cntry['.$CNT_ISO.']',
                 'class'            => '',
                 'options'          => $this->_yes_no_values,
                 'use_desc_4_label' => true,
@@ -771,7 +771,7 @@ 
             ],
             'CNT_cur_dec_plc' => [
                 'type'       => 'RADIO_BTN',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => '',
                 'options'    => [
                     ['id' => 0, 'text' => ''],
@@ -783,7 +783,7 @@ 
             ],
             'CNT_cur_dec_mrk' => [
                 'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
+                'input_name'       => 'cntry['.$CNT_ISO.']',
                 'class'            => '',
                 'options'          => [
                     [
@@ -797,7 +797,7 @@ 
             ],
             'CNT_cur_thsnds'  => [
                 'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
+                'input_name'       => 'cntry['.$CNT_ISO.']',
                 'class'            => '',
                 'options'          => [
                     [
@@ -826,12 +826,12 @@ 
             ],
             'CNT_tel_code'    => [
                 'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
+                'input_name' => 'cntry['.$CNT_ISO.']',
                 'class'      => 'small-text',
             ],
             'CNT_is_EU'       => [
                 'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
+                'input_name'       => 'cntry['.$CNT_ISO.']',
                 'class'            => '',
                 'options'          => $this->_yes_no_values,
                 'use_desc_4_label' => true,
@@ -841,8 +841,8 @@ 
             $country,
             $country_input_types
         );
-        $country_details_settings       = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
+        $country_details_settings = EEH_Template::display_template(
+            GEN_SET_TEMPLATE_PATH.'country_details_settings.template.php',
             $this->_template_args,
             true
         );
@@ -876,7 +876,7 @@ 
     public function display_country_states(string $CNT_ISO = '', ?EE_Country $country = null): string
     {
         $CNT_ISO = $this->getCountryISO($CNT_ISO);
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             return '';
         }
         // for ajax
@@ -906,14 +906,14 @@ 
                             'STA_abbrev' => [
                                 'type'             => 'TEXT',
                                 'label'            => esc_html__('Code', 'event_espresso'),
-                                'input_name'       => 'states[' . $STA_ID . ']',
+                                'input_name'       => 'states['.$STA_ID.']',
                                 'class'            => 'small-text',
                                 'add_mobile_label' => true,
                             ],
                             'STA_name'   => [
                                 'type'             => 'TEXT',
                                 'label'            => esc_html__('Name', 'event_espresso'),
-                                'input_name'       => 'states[' . $STA_ID . ']',
+                                'input_name'       => 'states['.$STA_ID.']',
                                 'class'            => 'regular-text',
                                 'add_mobile_label' => true,
                             ],
@@ -923,7 +923,7 @@ 
                                     'State Appears in Dropdown Select Lists',
                                     'event_espresso'
                                 ),
-                                'input_name'       => 'states[' . $STA_ID . ']',
+                                'input_name'       => 'states['.$STA_ID.']',
                                 'options'          => $this->_yes_no_values,
                                 'use_desc_4_label' => true,
                                 'add_mobile_label' => true,
@@ -941,8 +941,8 @@ 
                         GEN_SET_ADMIN_URL
                     );
 
-                    $this->_template_args['states'][ $STA_ID ]['inputs']           = $inputs;
-                    $this->_template_args['states'][ $STA_ID ]['delete_state_url'] = $delete_state_url;
+                    $this->_template_args['states'][$STA_ID]['inputs']           = $inputs;
+                    $this->_template_args['states'][$STA_ID]['delete_state_url'] = $delete_state_url;
                 }
             }
         } else {
@@ -955,7 +955,7 @@ 
         );
 
         $state_details_settings = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'state_details_settings.template.php',
             $this->_template_args,
             true
         );
@@ -987,7 +987,7 @@ 
     {
         $success = true;
         $CNT_ISO = $this->getCountryISO('');
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             EE_Error::add_error(
                 esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
                 __FILE__,
@@ -997,7 +997,7 @@ 
             $success = false;
         }
         $STA_abbrev = $this->request->getRequestParam('STA_abbrev');
-        if (! $STA_abbrev) {
+        if ( ! $STA_abbrev) {
             EE_Error::add_error(
                 esc_html__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
                 __FILE__,
@@ -1007,7 +1007,7 @@ 
             $success = false;
         }
         $STA_name = $this->request->getRequestParam('STA_name');
-        if (! $STA_name) {
+        if ( ! $STA_name) {
             EE_Error::add_error(
                 esc_html__('No State name or an invalid State name was received.', 'event_espresso'),
                 __FILE__,
@@ -1024,7 +1024,7 @@ 
                 'STA_name'   => $STA_name,
                 'STA_active' => true,
             ];
-            $success       = EEM_State::instance()->insert($cols_n_values);
+            $success = EEM_State::instance()->insert($cols_n_values);
             EE_Error::add_success(esc_html__('The State was added successfully.', 'event_espresso'));
         }
 
@@ -1057,7 +1057,7 @@ 
         $STA_ID     = $this->request->getRequestParam('STA_ID');
         $STA_abbrev = $this->request->getRequestParam('STA_abbrev');
 
-        if (! $STA_ID) {
+        if ( ! $STA_ID) {
             EE_Error::add_error(
                 esc_html__('No State ID or an invalid State ID was received.', 'event_espresso'),
                 __FILE__,
@@ -1106,7 +1106,7 @@ 
     protected function _update_country_settings()
     {
         $CNT_ISO = $this->getCountryISO();
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             EE_Error::add_error(
                 esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
                 __FILE__,
@@ -1125,25 +1125,25 @@ 
                 $country->ISO3()
             )
         );
-        $cols_n_values['CNT_name']        = $this->request->getRequestParam(
+        $cols_n_values['CNT_name'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_name]",
             $country->name()
         );
-        $cols_n_values['CNT_cur_code']    = strtoupper(
+        $cols_n_values['CNT_cur_code'] = strtoupper(
             $this->request->getRequestParam(
                 "cntry[$CNT_ISO][CNT_cur_code]",
                 $country->currency_code()
             )
         );
-        $cols_n_values['CNT_cur_single']  = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_single'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_single]",
             $country->currency_name_single()
         );
-        $cols_n_values['CNT_cur_plural']  = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_plural'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_plural]",
             $country->currency_name_plural()
         );
-        $cols_n_values['CNT_cur_sign']    = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_sign'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_sign]",
             $country->currency_sign()
         );
@@ -1160,15 +1160,15 @@ 
             "cntry[$CNT_ISO][CNT_cur_dec_mrk]",
             $country->currency_decimal_mark()
         );
-        $cols_n_values['CNT_cur_thsnds']  = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_thsnds'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_thsnds]",
             $country->currency_thousands_separator()
         );
-        $cols_n_values['CNT_tel_code']    = $this->request->getRequestParam(
+        $cols_n_values['CNT_tel_code'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_tel_code]",
             $country->telephoneCode()
         );
-        $cols_n_values['CNT_active']      = $this->request->getRequestParam(
+        $cols_n_values['CNT_active'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_active]",
             $country->isActive(),
             DataType::BOOL
@@ -1191,7 +1191,7 @@ 
             $this->request->getRequestParam('states', [], DataType::STRING, true)
         );
 
-        if (! empty($states) && $success !== false) {
+        if ( ! empty($states) && $success !== false) {
             // loop thru state data ( looks like : states[75][STA_name] )
             foreach ($states as $STA_ID => $state) {
                 $cols_n_values = [
@@ -1249,7 +1249,7 @@ 
         return '
 			<tr>
 				<th>
-					' . $label . '
+					' . $label.'
 				</th>';
     }
 
@@ -1264,7 +1264,7 @@ 
     {
         return '
 				<td class="general-settings-country-input-td">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
     }
@@ -1293,7 +1293,7 @@ 
     {
         return '
 				<td class="general-settings-country-state-input-td">
-					' . $input . '
+					' . $input.'
 				</td>';
     }
 
@@ -1313,9 +1313,9 @@ 
             ['post' => $ee_page_id, 'action' => 'edit'],
             admin_url('post.php')
         );
-        $links    = '<a href="' . esc_url_raw($edit_url) . '" >' . esc_html__('Edit', 'event_espresso') . '</a>';
+        $links = '<a href="'.esc_url_raw($edit_url).'" >'.esc_html__('Edit', 'event_espresso').'</a>';
         $links    .= ' &nbsp;|&nbsp; ';
-        $links    .= '<a href="' . get_permalink($ee_page_id) . '" >' . esc_html__('View', 'event_espresso') . '</a>';
+        $links    .= '<a href="'.get_permalink($ee_page_id).'" >'.esc_html__('View', 'event_espresso').'</a>';
 
         return $links;
     }
@@ -1348,9 +1348,9 @@ 
             $sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
         }
 
-        return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>'
+        return '<span style="color:'.$pg_colour.'; margin-right:2em;"><strong>'
                . $pg_status
-               . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
+               . '</strong></span><span style="color:'.$sc_colour.'"><strong>'.$sc_status.'</strong></span>';
     }
 
 
@@ -1370,7 +1370,7 @@ 
         bool $echo = true
     ): string {
         global $wpdb;
-        $items  = $wpdb->get_results(
+        $items = $wpdb->get_results(
             $wpdb->prepare(
                 "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
                 $parent
@@ -1385,8 +1385,8 @@ 
                 $post_title = wp_strip_all_tags($item->post_title);
                 $pad        = str_repeat('&nbsp;', $level * 3);
                 $option     = "\n\t";
-                $option     .= '<option class="level-' . $level . '" ';
-                $option     .= 'value="' . $ID . '" ';
+                $option     .= '<option class="level-'.$level.'" ';
+                $option     .= 'value="'.$ID.'" ';
                 $option     .= $ID === absint($default) ? ' selected' : '';
                 $option     .= '>';
                 $option     .= "$pad {$post_title}";