eventespresso / event-espresso-core

admin_pages/payments/Payments_Admin_Page.core.php

Indentation +1205 added lines, -1205 removed lines

@@ -16,1209 +16,1209 @@
  */
 class Payments_Admin_Page extends EE_Admin_Page
 {
-    /**
-     * Variables used for when we're re-sorting the logs results,
-     * in case we needed to do two queries, and we need to resort
-     *
-     * @var string
-     */
-    private $_sort_logs_again_direction;
-
-
-    /**
-     * @Constructor
-     * @access public
-     * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-    }
-
-
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_PAYMENTS_PG_SLUG;
-        $this->page_label = esc_html__('Payment Methods', 'event_espresso');
-        $this->_admin_base_url = EE_PAYMENTS_ADMIN_URL;
-        $this->_admin_base_path = EE_PAYMENTS_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ajax goes here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = $this->page_label;
-        $this->_labels = array(
-            'publishbox' => esc_html__('Update Settings', 'event_espresso'),
-        );
-    }
-
-
-    protected function _set_page_routes()
-    {
-        /**
-         * note that with payment method capabilities, although we've implemented
-         * capability mapping which will be used for accessing payment methods owned by
-         * other users.  This is not fully implemented yet in the payment method ui.
-         * Currently, only the "plural" caps are in active use.
-         * When cap mapping is implemented, some routes will need to use the singular form of
-         * capability method and also include the $id of the payment method for the route.
-         **/
-        $this->_page_routes = array(
-            'default'                   => array(
-                'func'       => '_payment_methods_list',
-                'capability' => 'ee_edit_payment_methods',
-            ),
-            'payment_settings'          => array(
-                'func'       => '_payment_settings',
-                'capability' => 'ee_manage_gateways',
-            ),
-            'activate_payment_method'   => array(
-                'func'       => '_activate_payment_method',
-                'noheader'   => true,
-                'capability' => 'ee_edit_payment_methods',
-            ),
-            'deactivate_payment_method' => array(
-                'func'       => '_deactivate_payment_method',
-                'noheader'   => true,
-                'capability' => 'ee_delete_payment_methods',
-            ),
-            'update_payment_method'     => array(
-                'func'               => '_update_payment_method',
-                'noheader'           => true,
-                'headers_sent_route' => 'default',
-                'capability'         => 'ee_edit_payment_methods',
-            ),
-            'update_payment_settings'   => array(
-                'func'       => '_update_payment_settings',
-                'noheader'   => true,
-                'capability' => 'ee_manage_gateways',
-            ),
-            'payment_log'               => array(
-                'func'       => '_payment_log_overview_list_table',
-                'capability' => 'ee_read_payment_methods',
-            ),
-            'payment_log_details'       => array(
-                'func'       => '_payment_log_details',
-                'capability' => 'ee_read_payment_methods',
-            ),
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _set_page_config()
-    {
-        $payment_method_list_config = array(
-            'nav'           => array(
-                'label' => esc_html__('Payment Methods', 'event_espresso'),
-                'icon' => 'dashicons-bank',
-                'order' => 10,
-            ),
-            'metaboxes'     => $this->_default_espresso_metaboxes,
-            'help_tabs'     => array_merge(
-                array(
-                    'payment_methods_overview_help_tab' => array(
-                        'title'    => esc_html__('Payment Methods Overview', 'event_espresso'),
-                        'filename' => 'payment_methods_overview',
-                    ),
-                ),
-                $this->_add_payment_method_help_tabs()
-            ),
-            'require_nonce' => false,
-        );
-        $this->_page_config = array(
-            'default'          => $payment_method_list_config,
-            'payment_settings' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Settings', 'event_espresso'),
-                    'icon' => 'dashicons-admin-generic',
-                    'order' => 20,
-                ),
-                'help_tabs'     => array(
-                    'payment_methods_settings_help_tab' => array(
-                        'title'    => esc_html__('Payment Method Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_settings',
-                    ),
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'require_nonce' => false,
-            ),
-            'payment_log'      => array(
-                'nav'           => array(
-                    'label' => esc_html__("Logs", 'event_espresso'),
-                    'icon' => 'dashicons-text-page',
-                    'order' => 30,
-                ),
-                'list_table'    => 'Payment_Log_Admin_List_Table',
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    /**
-     * @return array
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _add_payment_method_help_tabs()
-    {
-        EE_Registry::instance()->load_lib('Payment_Method_Manager');
-        $payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
-        $all_pmt_help_tabs_config = array();
-        foreach ($payment_method_types as $payment_method_type) {
-            if (
-                ! EE_Registry::instance()->CAP->current_user_can(
-                    $payment_method_type->cap_name(),
-                    'specific_payment_method_type_access'
-                )
-            ) {
-                continue;
-            }
-            foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
-                $template_args = isset($config['template_args']) ? $config['template_args'] : array();
-                $template_args['admin_page_obj'] = $this;
-                $all_pmt_help_tabs_config[ $help_tab_name ] = array(
-                    'title'   => $config['title'],
-                    'content' => EEH_Template::display_template(
-                        $payment_method_type->file_folder() . 'help_tabs/' . $config['filename'] . '.help_tab.php',
-                        $template_args,
-                        true
-                    ),
-                );
-            }
-        }
-        return $all_pmt_help_tabs_config;
-    }
-
-
-    // none of the below group are currently used for Gateway Settings
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        wp_register_style(
-            'espresso_payments',
-            EE_PAYMENTS_ASSETS_URL . 'ee-payments.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        // scripts
-        wp_enqueue_script('ee_admin_js');
-        wp_enqueue_script('ee-text-links');
-        wp_enqueue_script(
-            'espresso_payments',
-            EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js',
-            ['ee-datepicker'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-    }
-
-
-    public function load_scripts_styles_default()
-    {
-        wp_enqueue_style('espresso_payments');
-        wp_enqueue_style('ee-text-links');
-    }
-
-
-    public function load_scripts_styles_payment_log_details()
-    {
-        wp_enqueue_style('espresso_payments');
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _payment_methods_list()
-    {
-        /**
-         * first let's ensure payment methods have been set up.
-         * We do this here because when people activate a payment method for the first time (as an addon),
-         * it may not set up its capabilities or get registered correctly due to the loading process.
-         * However, people MUST set up the details for the payment method,
-         * so it's safe to do a recheck here.
-         */
-        EE_Registry::instance()->load_lib('Payment_Method_Manager');
-        EEM_Payment_Method::instance()->verify_button_urls();
-        // set up tabs, one for each payment method type
-        $tabs = array();
-        $payment_methods = array();
-        foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
-            // we don't want to show admin-only PMTs for now
-            if ($pmt_obj instanceof EE_PMT_Admin_Only) {
-                continue;
-            }
-            // check access
-            if (
-                ! EE_Registry::instance()->CAP->current_user_can(
-                    $pmt_obj->cap_name(),
-                    'specific_payment_method_type_access'
-                )
-            ) {
-                continue;
-            }
-            // check for any active pms of that type
-            $payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
-            if (! $payment_method instanceof EE_Payment_Method) {
-                $payment_method = EE_Payment_Method::new_instance(
-                    array(
-                        'PMD_slug'       => sanitize_key($pmt_obj->system_name()),
-                        'PMD_type'       => $pmt_obj->system_name(),
-                        'PMD_name'       => $pmt_obj->pretty_name(),
-                        'PMD_admin_name' => $pmt_obj->pretty_name(),
-                    )
-                );
-            }
-            $payment_methods[ $payment_method->slug() ] = $payment_method;
-        }
-        $payment_methods = apply_filters(
-            'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
-            $payment_methods
-        );
-        foreach ($payment_methods as $payment_method) {
-            if ($payment_method instanceof EE_Payment_Method) {
-                $this->addMetaBox(
-                    // html id
-                    'espresso_' . $payment_method->slug() . '_payment_settings',
-                    // title
-                    sprintf(esc_html__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
-                    // callback
-                    array($this, 'payment_method_settings_meta_box'),
-                    // post type
-                    null,
-                    // context
-                    'normal',
-                    // priority
-                    'default',
-                    // callback args
-                    array('payment_method' => $payment_method)
-                );
-                // setup for tabbed content
-                $tabs[ $payment_method->slug() ] = array(
-                    'label' => $payment_method->admin_name(),
-                    'class' => $payment_method->active() ? 'gateway-active' : '',
-                    'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-                    'title' => esc_html__('Modify this Payment Method', 'event_espresso'),
-                    'slug'  => $payment_method->slug(),
-                    'icon'  => $payment_method->active()
-                        ? '<span class="dashicons dashicons-yes-alt"></span>'
-                        : '<span class="dashicons dashicons-remove"></span>',
-                );
-            }
-        }
-        $this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links(
-            $tabs,
-            'payment_method_links',
-            '',
-            $this->_get_active_payment_method_slug()
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     *   _get_active_payment_method_slug
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_active_payment_method_slug()
-    {
-        $payment_method_slug = false;
-        // decide which payment method tab to open first, as dictated by the request's 'payment_method'
-        if (isset($this->_req_data['payment_method'])) {
-            // if they provided the current payment method, use it
-            $payment_method_slug = sanitize_key($this->_req_data['payment_method']);
-        }
-        /** @var EE_Payment_Method $payment_method */
-        $payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
-        // if that didn't work or wasn't provided, find another way to select the current pm
-        if (! $this->_verify_payment_method($payment_method)) {
-            // like, looking for an active one
-            $payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
-            // test that one as well
-            if ($this->_verify_payment_method($payment_method)) {
-                $payment_method_slug = $payment_method->slug();
-            } else {
-                $payment_method_slug = 'paypal_standard';
-            }
-        }
-        return $payment_method_slug;
-    }
-
-
-    /**
-     *    payment_method_settings_meta_box
-     *    returns TRUE if the passed payment method is properly constructed and the logged-in user has the correct
-     *    capabilities to access it
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return boolean
-     * @throws EE_Error
-     */
-    protected function _verify_payment_method($payment_method)
-    {
-        if (
-            $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base
-            && EE_Registry::instance()->CAP->current_user_can(
-                $payment_method->type_obj()->cap_name(),
-                'specific_payment_method_type_access'
-            )
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     *    payment_method_settings_meta_box
-     *
-     * @param NULL  $post_obj_which_is_null is an object containing the current post (as a $post object)
-     * @param array $metabox                is an array with metabox id, title, callback, and args elements. the value
-     *                                      at 'args' has key 'payment_method', as set within _payment_methods_list
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox)
-    {
-        $payment_method = isset($metabox['args'], $metabox['args']['payment_method'])
-            ? $metabox['args']['payment_method'] : null;
-        if (! $payment_method instanceof EE_Payment_Method) {
-            throw new EE_Error(
-                esc_html__(
-                    'Payment method metabox setup incorrectly. No Payment method object was supplied',
-                    'event_espresso'
-                )
-            );
-        }
-        $payment_method_scopes = $payment_method->active();
-        // if the payment method really exists show its form, otherwise the activation template
-        if ($payment_method->ID() && ! empty($payment_method_scopes)) {
-            $form = $this->_generate_payment_method_settings_form($payment_method);
-            if ($form->form_data_present_in($this->_req_data)) {
-                $form->receive_form_submission($this->_req_data);
-            }
-            echo wp_kses($form->form_open() . $form->get_html_and_js() . $form->form_close(), AllowedTags::getWithFormTags());
-        } else {
-            echo wp_kses($this->_activate_payment_method_button($payment_method)->get_html_and_js(), AllowedTags::getWithFormTags());
-        }
-    }
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     */
-    protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method = null)
-    {
-        if (! $payment_method instanceof EE_Payment_Method) {
-            return new EE_Form_Section_Proper();
-        }
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => $payment_method->slug() . '_settings_form',
-                'html_id'         => $payment_method->slug() . '_settings_form',
-                'action'          => EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'action'         => 'update_payment_method',
-                        'payment_method' => $payment_method->slug(),
-                    ),
-                    EE_PAYMENTS_ADMIN_URL
-                ),
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
-                    array(
-                        'pci_dss_compliance'      => $this->_pci_dss_compliance($payment_method),
-                        'currency_support'        => $this->_currency_support($payment_method),
-                        'payment_method_settings' => $this->_payment_method_settings($payment_method),
-                        'update'                  => $this->_update_payment_method_button($payment_method),
-                        'deactivate'              => $this->_deactivate_payment_method_button($payment_method),
-                        'fine_print'              => $this->_fine_print(),
-                    ),
-                    $payment_method
-                ),
-            )
-        );
-    }
-
-
-    /**
-     * _pci_dss_compliance
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML
-     * @throws EE_Error
-     */
-    protected function _pci_dss_compliance(EE_Payment_Method $payment_method)
-    {
-        if ($payment_method->type_obj()->requires_https()) {
-            return new EE_Form_Section_HTML(
-                EEH_HTML::table(
-                    EEH_HTML::tr(
-                        EEH_HTML::th(
-                            EEH_HTML::label(
-                                EEH_HTML::strong(
-                                    esc_html__('IMPORTANT', 'event_espresso'),
-                                    '',
-                                    'important-notice'
-                                )
-                            )
-                        ) .
-                        EEH_HTML::td(
-                            EEH_HTML::strong(
-                                esc_html__(
-                                    'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.',
-                                    'event_espresso'
-                                )
-                            )
-                            .
-                            EEH_HTML::br()
-                            .
-                            esc_html__('Learn more about ', 'event_espresso')
-                            . EEH_HTML::link(
-                                'https://www.pcisecuritystandards.org/merchants/index.php',
-                                esc_html__('PCI DSS compliance', 'event_espresso')
-                            )
-                        )
-                    )
-                )
-            );
-        }
-        return new EE_Form_Section_HTML('');
-    }
-
-
-    /**
-     * _currency_support
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML
-     * @throws EE_Error
-     */
-    protected function _currency_support(EE_Payment_Method $payment_method)
-    {
-        if (! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
-            return new EE_Form_Section_HTML(
-                EEH_HTML::table(
-                    EEH_HTML::tr(
-                        EEH_HTML::th(
-                            EEH_HTML::label(
-                                EEH_HTML::strong(
-                                    esc_html__('IMPORTANT', 'event_espresso'),
-                                    '',
-                                    'important-notice'
-                                )
-                            )
-                        ) .
-                        EEH_HTML::td(
-                            EEH_HTML::strong(
-                                sprintf(
-                                    esc_html__(
-                                        'This payment method does not support the currency set on your site (%1$s). Please activate a different payment method or change your site\'s country and associated currency.',
-                                        'event_espresso'
-                                    ),
-                                    EE_Config::instance()->currency->code
-                                )
-                            )
-                        )
-                    )
-                )
-            );
-        }
-        return new EE_Form_Section_HTML('');
-    }
-
-
-    /**
-     * _update_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     */
-    protected function _payment_method_settings(EE_Payment_Method $payment_method)
-    {
-        // modify the form, so we only have/show fields that will be implemented for this version
-        return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
-    }
-
-
-    /**
-     * Simplifies the form to merely reproduce 4.1's gateway settings functionality
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @param string                 $payment_method_name
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     */
-    protected function _simplify_form($form_section, $payment_method_name = '')
-    {
-        if ($form_section instanceof EE_Payment_Method_Form) {
-            $form_section->exclude(
-                array(
-                    'PMD_type', // don't want them changing the type
-                    'PMD_slug', // or the slug (probably never)
-                    'PMD_wp_user', // or the user's ID
-                    'Currency' // or the currency, until the rest of EE supports simultaneous currencies
-                )
-            );
-            return $form_section;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.',
-                        'event_espresso'
-                    ),
-                    $payment_method_name
-                )
-            );
-        }
-    }
-
-
-    /**
-     * _update_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML
-     * @throws EE_Error
-     */
-    protected function _update_payment_method_button(EE_Payment_Method $payment_method)
-    {
-        $update_button = new EE_Submit_Input(
-            array(
-                'name'       => 'submit',
-                'html_id'    => 'save_' . $payment_method->slug() . '_settings',
-                'default'    => sprintf(
-                    esc_html__('Update %s Payment Settings', 'event_espresso'),
-                    $payment_method->admin_name()
-                ),
-                'html_label' => EEH_HTML::nbsp(),
-            )
-        );
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::no_row(EEH_HTML::br(2)) .
-                EEH_HTML::tr(
-                    EEH_HTML::th(esc_html__('Update Settings', 'event_espresso')) .
-                    EEH_HTML::td(
-                        $update_button->get_html_for_input()
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * _deactivate_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML
-     */
-    protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method)
-    {
-        $link_text_and_title = sprintf(
-            esc_html__('Deactivate %1$s Payments?', 'event_espresso'),
-            $payment_method->admin_name()
-        );
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::tr(
-                    EEH_HTML::th(esc_html__('Deactivate Payment Method', 'event_espresso')) .
-                    EEH_HTML::td(
-                        EEH_HTML::link(
-                            EE_Admin_Page::add_query_args_and_nonce(
-                                array(
-                                    'action'         => 'deactivate_payment_method',
-                                    'payment_method' => $payment_method->slug(),
-                                ),
-                                EE_PAYMENTS_ADMIN_URL
-                            ),
-                            $link_text_and_title,
-                            $link_text_and_title,
-                            'deactivate_' . $payment_method->slug(),
-                            'button button--secondary'
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * _activate_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     */
-    protected function _activate_payment_method_button(EE_Payment_Method $payment_method)
-    {
-        $link_text_and_title = sprintf(
-            esc_html__('Activate %1$s Payment Method?', 'event_espresso'),
-            $payment_method->admin_name()
-        );
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'activate_' . $payment_method->slug() . '_settings_form',
-                'html_id'         => 'activate_' . $payment_method->slug() . '_settings_form',
-                'action'          => '#',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__Payments_Admin_Page___activate_payment_method_button__form_subsections',
-                    array(
-                        new EE_Form_Section_HTML(
-                            EEH_HTML::table(
-                                EEH_HTML::tr(
-                                    EEH_HTML::td(
-                                        $payment_method->type_obj()->introductory_html(),
-                                        '',
-                                        '',
-                                        '',
-                                        'colspan="2"'
-                                    )
-                                ) .
-                                EEH_HTML::tr(
-                                    EEH_HTML::th(
-                                        EEH_HTML::label(esc_html__('Click to Activate ', 'event_espresso'))
-                                    ) .
-                                    EEH_HTML::td(
-                                        EEH_HTML::link(
-                                            EE_Admin_Page::add_query_args_and_nonce(
-                                                array(
-                                                    'action'              => 'activate_payment_method',
-                                                    'payment_method_type' => $payment_method->type(),
-                                                ),
-                                                EE_PAYMENTS_ADMIN_URL
-                                            ),
-                                            $link_text_and_title,
-                                            $link_text_and_title,
-                                            'activate_' . $payment_method->slug(),
-                                            'button button--primary-alt'
-                                        )
-                                    )
-                                )
-                            )
-                        ),
-                    ),
-                    $payment_method
-                ),
-            )
-        );
-    }
-
-
-    /**
-     * _fine_print
-     *
-     * @access protected
-     * @return EE_Form_Section_HTML
-     */
-    protected function _fine_print()
-    {
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::tr(
-                    EEH_HTML::th() .
-                    EEH_HTML::td(
-                        EEH_HTML::p(esc_html__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @global WP_User $current_user
-     */
-    protected function _activate_payment_method()
-    {
-        if (isset($this->_req_data['payment_method_type'])) {
-            $payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
-            // see if one exists
-            EE_Registry::instance()->load_lib('Payment_Method_Manager');
-            $payment_method = EE_Payment_Method_Manager::instance()
-                                                       ->activate_a_payment_method_of_type($payment_method_type);
-            $this->_redirect_after_action(
-                1,
-                'Payment Method',
-                'activated',
-                array('action' => 'default', 'payment_method' => $payment_method->slug())
-            );
-        } else {
-            $this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _deactivate_payment_method()
-    {
-        if (isset($this->_req_data['payment_method'])) {
-            $payment_method_slug = sanitize_key($this->_req_data['payment_method']);
-            // deactivate it
-            EE_Registry::instance()->load_lib('Payment_Method_Manager');
-            $count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
-            $this->_redirect_after_action(
-                $count_updated,
-                'Payment Method',
-                'deactivated',
-                array('action' => 'default', 'payment_method' => $payment_method_slug)
-            );
-        } else {
-            $this->_redirect_after_action(false, 'Payment Method', 'deactivated', array('action' => 'default'));
-        }
-    }
-
-
-    /**
-     * Processes the payment method form that was submitted. This is slightly trickier than usual form
-     * processing because we first need to identify WHICH form was processed and which payment method
-     * it corresponds to. Once we have done that, we see if the form is valid. If it is, the
-     * form's data is saved, and we redirect to the default payment methods page, setting the updated payment method
-     * as the currently-selected one. If it DOESN'T validate, we render the page with the form's errors (in the
-     * subsequently called 'headers_sent_func' which is _payment_methods_list)
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _update_payment_method()
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            // ok let's find which gateway form to use based on the form input
-            EE_Registry::instance()->load_lib('Payment_Method_Manager');
-            /** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
-            $correct_pmt_form_to_use = null;
-            $payment_method = null;
-            foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
-                if ($payment_method instanceof EE_Payment_Method) {
-                    // get the form and simplify it, like what we do when we display it
-                    $pmt_form = $this->_generate_payment_method_settings_form($payment_method);
-                    if ($pmt_form->form_data_present_in($this->_req_data)) {
-                        $correct_pmt_form_to_use = $pmt_form;
-                        break;
-                    }
-                }
-            }
-            // if we couldn't find the correct payment method type...
-            if (! $correct_pmt_form_to_use) {
-                EE_Error::add_error(
-                    esc_html__(
-                        "We could not find which payment method type your form submission related to. Please contact support",
-                        'event_espresso'
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                $this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
-            }
-            $correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-            if ($correct_pmt_form_to_use->is_valid()) {
-                $payment_settings_subform = $correct_pmt_form_to_use->get_subsection('payment_method_settings');
-                if (! $payment_settings_subform instanceof EE_Payment_Method_Form) {
-                    throw new EE_Error(
-                        sprintf(
-                            esc_html__(
-                                'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.',
-                                'event_espresso'
-                            ),
-                            'payment_method_settings'
-                        )
-                    );
-                }
-                $payment_settings_subform->save();
-                /** @var $pm EE_Payment_Method */
-                $this->_redirect_after_action(
-                    true,
-                    'Payment Method',
-                    'updated',
-                    array('action' => 'default', 'payment_method' => $payment_method->slug())
-                );
-            } else {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'Payment method of type %s was not saved because there were validation errors. They have been marked in the form',
-                            'event_espresso'
-                        ),
-                        $payment_method instanceof EE_Payment_Method ? $payment_method->type_obj()->pretty_name()
-                            : esc_html__('"(unknown)"', 'event_espresso')
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-        }
-    }
-
-
-    /**
-     * Displays payment settings (not payment METHOD settings, that's _payment_method_settings)
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _payment_settings()
-    {
-        $form = $this->getPaymentSettingsForm();
-        $this->_set_add_edit_form_tags('update_payment_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_HTML::div(
-            $form->get_html_and_js(),
-            '',
-            'padding'
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     *        _update_payment_settings
-     *
-     * @access protected
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _update_payment_settings()
-    {
-        $form = $this->getPaymentSettingsForm();
-        if ($form->was_submitted($this->_req_data)) {
-            $form->receive_form_submission($this->_req_data);
-            if ($form->is_valid()) {
-                /**
-                 * @var $reg_config EE_Registration_Config
-                 */
-                $loader = LoaderFactory::getLoader();
-                $reg_config = $loader->getShared('EE_Registration_Config');
-                $valid_data = $form->valid_data();
-                $reg_config->show_pending_payment_options = $valid_data['show_pending_payment_options'];
-                $reg_config->gateway_log_lifespan = $valid_data['gateway_log_lifespan'];
-            }
-        }
-        EE_Registry::instance()->CFG = apply_filters(
-            'FHEE__Payments_Admin_Page___update_payment_settings__CFG',
-            EE_Registry::instance()->CFG
-        );
-
-        $what = esc_html__('Payment Settings', 'event_espresso');
-        $success = $this->_update_espresso_configuration(
-            $what,
-            EE_Registry::instance()->CFG,
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        $this->_redirect_after_action(
-            $success,
-            $what,
-            esc_html__('updated', 'event_espresso'),
-            array('action' => 'payment_settings')
-        );
-    }
-
-
-    /**
-     * Gets the form used for updating payment settings
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function getPaymentSettingsForm()
-    {
-        /**
-         * @var $reg_config EE_Registration_Config
-         */
-        $reg_config = LoaderFactory::getLoader()->getShared('EE_Registration_Config');
-        return new EE_Form_Section_Proper(
-            array(
-                'name' => 'payment-settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections' => array(
-                    'show_pending_payment_options' => new EE_Yes_No_Input(
-                        array(
-                            'html_name' => 'show_pending_payment_options',
-                            'default' => $reg_config->show_pending_payment_options,
-                            'html_help_text' => esc_html__(
-                                "If a payment is marked as 'Pending Payment', or if payment is deferred (ie, an offline gateway like Check, Bank, or Invoice is used), then give registrants the option to retry payment. ",
-                                'event_espresso'
-                            )
-                        )
-                    ),
-                    'gateway_log_lifespan' => new EE_Select_Input(
-                        $reg_config->gatewayLogLifespanOptions(),
-                        array(
-                            'html_label_text' => esc_html__('Gateway Logs Lifespan', 'event_espresso'),
-                            'html_help_text' => esc_html__('If issues arise with payments being made through a payment gateway, it\'s helpful to log non-sensitive communications with the payment gateway. But it\'s a security responsibility, so it\'s a good idea to not keep them for any longer than necessary.', 'event_espresso'),
-                            'default' => $reg_config->gateway_log_lifespan,
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _payment_log_overview_list_table()
-    {
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    protected function _set_list_table_views_payment_log()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'  => 'all',
-                'label' => esc_html__('View All Logs', 'event_espresso'),
-                'count' => 0,
-            ),
-        );
-    }
-
-
-    /**
-     * @param int  $per_page
-     * @param int  $current_page
-     * @param bool $count
-     * @return array|int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_payment_logs($per_page = 50, $current_page = 0, $count = false)
-    {
-        EE_Registry::instance()->load_model('Change_Log');
-        // we may need to do multiple queries (joining differently), so we actually want an array of query params
-        $query_params = array(array('LOG_type' => EEM_Change_Log::type_gateway));
-        // check if they've selected a specific payment method
-        if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
-            $query_params[0]['OR*pm_or_pay_pm'] = array(
-                'Payment.Payment_Method.PMD_ID' => $this->_req_data['_payment_method'],
-                'Payment_Method.PMD_ID'         => $this->_req_data['_payment_method'],
-            );
-        }
-        // take into account search
-        if (isset($this->_req_data['s']) && $this->_req_data['s']) {
-            $similarity_string = array('LIKE', '%' . str_replace("", "%", $this->_req_data['s']) . '%');
-            $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Payment_Method.PMD_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Payment_Method.PMD_admin_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Payment_Method.PMD_type'] = $similarity_string;
-            $query_params[0]['OR*s']['LOG_message'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment_Method.PMD_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment_Method.PMD_admin_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment_Method.PMD_type'] = $similarity_string;
-            $query_params[0]['OR*s']['LOG_message'] = $similarity_string;
-        }
-        if (
-            isset($this->_req_data['payment-filter-start-date'])
-            && isset($this->_req_data['payment-filter-end-date'])
-        ) {
-            // add date
-            $start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
-            $end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
-            // make sure our timestamps start and end right at the boundaries for each day
-            $start_date = date('Y-m-d', strtotime($start_date)) . ' 00:00:00';
-            $end_date = date('Y-m-d', strtotime($end_date)) . ' 23:59:59';
-            // convert to timestamps
-            $start_date = strtotime($start_date);
-            $end_date = strtotime($end_date);
-            // makes sure start date is the lowest value and vice versa
-            $start_date = min($start_date, $end_date);
-            $end_date = max($start_date, $end_date);
-            // convert for query
-            $start_date = EEM_Change_Log::instance()->convert_datetime_for_query(
-                'LOG_time',
-                date('Y-m-d H:i:s', $start_date),
-                'Y-m-d H:i:s'
-            );
-            $end_date   = EEM_Change_Log::instance()->convert_datetime_for_query(
-                'LOG_time',
-                date('Y-m-d H:i:s', $end_date),
-                'Y-m-d H:i:s'
-            );
-            $query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
-        }
-        if ($count) {
-            return EEM_Change_Log::instance()->count($query_params);
-        }
-        if (isset($this->_req_data['order'])) {
-            $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order']))
-                ? $this->_req_data['order']
-                : 'DESC';
-            $query_params['order_by'] = array('LOG_time' => $sort);
-        } else {
-            $query_params['order_by'] = array('LOG_time' => 'DESC');
-        }
-        $offset = ($current_page - 1) * $per_page;
-        if (! isset($this->_req_data['download_results'])) {
-            $query_params['limit'] = array($offset, $per_page);
-        }
-        // now they've requested to instead just download the file instead of viewing it.
-        if (isset($this->_req_data['download_results'])) {
-            $wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
-            header('Content-Disposition: attachment');
-            header("Content-Disposition: attachment; filename=ee_payment_logs_for_" . sanitize_key(site_url()));
-            echo '<h1> '
-                . sprintf(
-                    esc_html__('Payment Logs for %1$s', 'event_espresso'),
-                    esc_url_raw(site_url())
-                )
-                . '</h1 >';
-            echo '<h3>' . esc_html__('Query:', 'event_espresso') . '</h3>';
-            echo esc_html(var_export($query_params, true));
-            echo '<h3>' . esc_html__('Results:', 'event_espresso') . '</h3>';
-            echo esc_html(var_export($wpdb_results, true));
-            die;
-        }
-        return EEM_Change_Log::instance()->get_all($query_params);
-    }
-
-
-    /**
-     * Used by usort to RE-sort log query results, because we lose the ordering
-     * because we're possibly combining the results from two queries
-     *
-     * @param EE_Change_Log $logA
-     * @param EE_Change_Log $logB
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _sort_logs_again($logA, $logB)
-    {
-        $timeA = $logA->get_raw('LOG_time');
-        $timeB = $logB->get_raw('LOG_time');
-        if ($timeA == $timeB) {
-            return 0;
-        }
-        $comparison = $timeA < $timeB ? -1 : 1;
-        if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
-            return $comparison * -1;
-        }
-        return $comparison;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _payment_log_details()
-    {
-        EE_Registry::instance()->load_model('Change_Log');
-        /** @var $payment_log EE_Change_Log */
-        $payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
-        $payment_method = null;
-        $transaction = null;
-        if ($payment_log instanceof EE_Change_Log) {
-            if ($payment_log->object() instanceof EE_Payment) {
-                $payment_method = $payment_log->object()->payment_method();
-                $transaction = $payment_log->object()->transaction();
-            } elseif ($payment_log->object() instanceof EE_Payment_Method) {
-                $payment_method = $payment_log->object();
-            } elseif ($payment_log->object() instanceof EE_Transaction) {
-                $transaction = $payment_log->object();
-                $payment_method = $transaction->payment_method();
-            }
-        }
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
-            array(
-                'payment_log'    => $payment_log,
-                'payment_method' => $payment_method,
-                'transaction'    => $transaction,
-            ),
-            true
-        );
-        $this->display_admin_page_with_no_sidebar();
-    }
+	/**
+	 * Variables used for when we're re-sorting the logs results,
+	 * in case we needed to do two queries, and we need to resort
+	 *
+	 * @var string
+	 */
+	private $_sort_logs_again_direction;
+
+
+	/**
+	 * @Constructor
+	 * @access public
+	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+	}
+
+
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_PAYMENTS_PG_SLUG;
+		$this->page_label = esc_html__('Payment Methods', 'event_espresso');
+		$this->_admin_base_url = EE_PAYMENTS_ADMIN_URL;
+		$this->_admin_base_path = EE_PAYMENTS_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ajax goes here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = $this->page_label;
+		$this->_labels = array(
+			'publishbox' => esc_html__('Update Settings', 'event_espresso'),
+		);
+	}
+
+
+	protected function _set_page_routes()
+	{
+		/**
+		 * note that with payment method capabilities, although we've implemented
+		 * capability mapping which will be used for accessing payment methods owned by
+		 * other users.  This is not fully implemented yet in the payment method ui.
+		 * Currently, only the "plural" caps are in active use.
+		 * When cap mapping is implemented, some routes will need to use the singular form of
+		 * capability method and also include the $id of the payment method for the route.
+		 **/
+		$this->_page_routes = array(
+			'default'                   => array(
+				'func'       => '_payment_methods_list',
+				'capability' => 'ee_edit_payment_methods',
+			),
+			'payment_settings'          => array(
+				'func'       => '_payment_settings',
+				'capability' => 'ee_manage_gateways',
+			),
+			'activate_payment_method'   => array(
+				'func'       => '_activate_payment_method',
+				'noheader'   => true,
+				'capability' => 'ee_edit_payment_methods',
+			),
+			'deactivate_payment_method' => array(
+				'func'       => '_deactivate_payment_method',
+				'noheader'   => true,
+				'capability' => 'ee_delete_payment_methods',
+			),
+			'update_payment_method'     => array(
+				'func'               => '_update_payment_method',
+				'noheader'           => true,
+				'headers_sent_route' => 'default',
+				'capability'         => 'ee_edit_payment_methods',
+			),
+			'update_payment_settings'   => array(
+				'func'       => '_update_payment_settings',
+				'noheader'   => true,
+				'capability' => 'ee_manage_gateways',
+			),
+			'payment_log'               => array(
+				'func'       => '_payment_log_overview_list_table',
+				'capability' => 'ee_read_payment_methods',
+			),
+			'payment_log_details'       => array(
+				'func'       => '_payment_log_details',
+				'capability' => 'ee_read_payment_methods',
+			),
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _set_page_config()
+	{
+		$payment_method_list_config = array(
+			'nav'           => array(
+				'label' => esc_html__('Payment Methods', 'event_espresso'),
+				'icon' => 'dashicons-bank',
+				'order' => 10,
+			),
+			'metaboxes'     => $this->_default_espresso_metaboxes,
+			'help_tabs'     => array_merge(
+				array(
+					'payment_methods_overview_help_tab' => array(
+						'title'    => esc_html__('Payment Methods Overview', 'event_espresso'),
+						'filename' => 'payment_methods_overview',
+					),
+				),
+				$this->_add_payment_method_help_tabs()
+			),
+			'require_nonce' => false,
+		);
+		$this->_page_config = array(
+			'default'          => $payment_method_list_config,
+			'payment_settings' => array(
+				'nav'           => array(
+					'label' => esc_html__('Settings', 'event_espresso'),
+					'icon' => 'dashicons-admin-generic',
+					'order' => 20,
+				),
+				'help_tabs'     => array(
+					'payment_methods_settings_help_tab' => array(
+						'title'    => esc_html__('Payment Method Settings', 'event_espresso'),
+						'filename' => 'payment_methods_settings',
+					),
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'require_nonce' => false,
+			),
+			'payment_log'      => array(
+				'nav'           => array(
+					'label' => esc_html__("Logs", 'event_espresso'),
+					'icon' => 'dashicons-text-page',
+					'order' => 30,
+				),
+				'list_table'    => 'Payment_Log_Admin_List_Table',
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	/**
+	 * @return array
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _add_payment_method_help_tabs()
+	{
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
+		$all_pmt_help_tabs_config = array();
+		foreach ($payment_method_types as $payment_method_type) {
+			if (
+				! EE_Registry::instance()->CAP->current_user_can(
+					$payment_method_type->cap_name(),
+					'specific_payment_method_type_access'
+				)
+			) {
+				continue;
+			}
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
+				$all_pmt_help_tabs_config[ $help_tab_name ] = array(
+					'title'   => $config['title'],
+					'content' => EEH_Template::display_template(
+						$payment_method_type->file_folder() . 'help_tabs/' . $config['filename'] . '.help_tab.php',
+						$template_args,
+						true
+					),
+				);
+			}
+		}
+		return $all_pmt_help_tabs_config;
+	}
+
+
+	// none of the below group are currently used for Gateway Settings
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		wp_register_style(
+			'espresso_payments',
+			EE_PAYMENTS_ASSETS_URL . 'ee-payments.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		// scripts
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script(
+			'espresso_payments',
+			EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js',
+			['ee-datepicker'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+	}
+
+
+	public function load_scripts_styles_default()
+	{
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
+	}
+
+
+	public function load_scripts_styles_payment_log_details()
+	{
+		wp_enqueue_style('espresso_payments');
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _payment_methods_list()
+	{
+		/**
+		 * first let's ensure payment methods have been set up.
+		 * We do this here because when people activate a payment method for the first time (as an addon),
+		 * it may not set up its capabilities or get registered correctly due to the loading process.
+		 * However, people MUST set up the details for the payment method,
+		 * so it's safe to do a recheck here.
+		 */
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		EEM_Payment_Method::instance()->verify_button_urls();
+		// set up tabs, one for each payment method type
+		$tabs = array();
+		$payment_methods = array();
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
+			// we don't want to show admin-only PMTs for now
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
+				continue;
+			}
+			// check access
+			if (
+				! EE_Registry::instance()->CAP->current_user_can(
+					$pmt_obj->cap_name(),
+					'specific_payment_method_type_access'
+				)
+			) {
+				continue;
+			}
+			// check for any active pms of that type
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if (! $payment_method instanceof EE_Payment_Method) {
+				$payment_method = EE_Payment_Method::new_instance(
+					array(
+						'PMD_slug'       => sanitize_key($pmt_obj->system_name()),
+						'PMD_type'       => $pmt_obj->system_name(),
+						'PMD_name'       => $pmt_obj->pretty_name(),
+						'PMD_admin_name' => $pmt_obj->pretty_name(),
+					)
+				);
+			}
+			$payment_methods[ $payment_method->slug() ] = $payment_method;
+		}
+		$payment_methods = apply_filters(
+			'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
+			$payment_methods
+		);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$this->addMetaBox(
+					// html id
+					'espresso_' . $payment_method->slug() . '_payment_settings',
+					// title
+					sprintf(esc_html__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
+					// callback
+					array($this, 'payment_method_settings_meta_box'),
+					// post type
+					null,
+					// context
+					'normal',
+					// priority
+					'default',
+					// callback args
+					array('payment_method' => $payment_method)
+				);
+				// setup for tabbed content
+				$tabs[ $payment_method->slug() ] = array(
+					'label' => $payment_method->admin_name(),
+					'class' => $payment_method->active() ? 'gateway-active' : '',
+					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
+					'title' => esc_html__('Modify this Payment Method', 'event_espresso'),
+					'slug'  => $payment_method->slug(),
+					'icon'  => $payment_method->active()
+						? '<span class="dashicons dashicons-yes-alt"></span>'
+						: '<span class="dashicons dashicons-remove"></span>',
+				);
+			}
+		}
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links(
+			$tabs,
+			'payment_method_links',
+			'',
+			$this->_get_active_payment_method_slug()
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 *   _get_active_payment_method_slug
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_active_payment_method_slug()
+	{
+		$payment_method_slug = false;
+		// decide which payment method tab to open first, as dictated by the request's 'payment_method'
+		if (isset($this->_req_data['payment_method'])) {
+			// if they provided the current payment method, use it
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
+		}
+		/** @var EE_Payment_Method $payment_method */
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
+		// if that didn't work or wasn't provided, find another way to select the current pm
+		if (! $this->_verify_payment_method($payment_method)) {
+			// like, looking for an active one
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
+			// test that one as well
+			if ($this->_verify_payment_method($payment_method)) {
+				$payment_method_slug = $payment_method->slug();
+			} else {
+				$payment_method_slug = 'paypal_standard';
+			}
+		}
+		return $payment_method_slug;
+	}
+
+
+	/**
+	 *    payment_method_settings_meta_box
+	 *    returns TRUE if the passed payment method is properly constructed and the logged-in user has the correct
+	 *    capabilities to access it
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	protected function _verify_payment_method($payment_method)
+	{
+		if (
+			$payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base
+			&& EE_Registry::instance()->CAP->current_user_can(
+				$payment_method->type_obj()->cap_name(),
+				'specific_payment_method_type_access'
+			)
+		) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 *    payment_method_settings_meta_box
+	 *
+	 * @param NULL  $post_obj_which_is_null is an object containing the current post (as a $post object)
+	 * @param array $metabox                is an array with metabox id, title, callback, and args elements. the value
+	 *                                      at 'args' has key 'payment_method', as set within _payment_methods_list
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox)
+	{
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method'])
+			? $metabox['args']['payment_method'] : null;
+		if (! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(
+				esc_html__(
+					'Payment method metabox setup incorrectly. No Payment method object was supplied',
+					'event_espresso'
+				)
+			);
+		}
+		$payment_method_scopes = $payment_method->active();
+		// if the payment method really exists show its form, otherwise the activation template
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+			$form = $this->_generate_payment_method_settings_form($payment_method);
+			if ($form->form_data_present_in($this->_req_data)) {
+				$form->receive_form_submission($this->_req_data);
+			}
+			echo wp_kses($form->form_open() . $form->get_html_and_js() . $form->form_close(), AllowedTags::getWithFormTags());
+		} else {
+			echo wp_kses($this->_activate_payment_method_button($payment_method)->get_html_and_js(), AllowedTags::getWithFormTags());
+		}
+	}
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 */
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method = null)
+	{
+		if (! $payment_method instanceof EE_Payment_Method) {
+			return new EE_Form_Section_Proper();
+		}
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => $payment_method->slug() . '_settings_form',
+				'html_id'         => $payment_method->slug() . '_settings_form',
+				'action'          => EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'action'         => 'update_payment_method',
+						'payment_method' => $payment_method->slug(),
+					),
+					EE_PAYMENTS_ADMIN_URL
+				),
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
+					array(
+						'pci_dss_compliance'      => $this->_pci_dss_compliance($payment_method),
+						'currency_support'        => $this->_currency_support($payment_method),
+						'payment_method_settings' => $this->_payment_method_settings($payment_method),
+						'update'                  => $this->_update_payment_method_button($payment_method),
+						'deactivate'              => $this->_deactivate_payment_method_button($payment_method),
+						'fine_print'              => $this->_fine_print(),
+					),
+					$payment_method
+				),
+			)
+		);
+	}
+
+
+	/**
+	 * _pci_dss_compliance
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML
+	 * @throws EE_Error
+	 */
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method)
+	{
+		if ($payment_method->type_obj()->requires_https()) {
+			return new EE_Form_Section_HTML(
+				EEH_HTML::table(
+					EEH_HTML::tr(
+						EEH_HTML::th(
+							EEH_HTML::label(
+								EEH_HTML::strong(
+									esc_html__('IMPORTANT', 'event_espresso'),
+									'',
+									'important-notice'
+								)
+							)
+						) .
+						EEH_HTML::td(
+							EEH_HTML::strong(
+								esc_html__(
+									'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.',
+									'event_espresso'
+								)
+							)
+							.
+							EEH_HTML::br()
+							.
+							esc_html__('Learn more about ', 'event_espresso')
+							. EEH_HTML::link(
+								'https://www.pcisecuritystandards.org/merchants/index.php',
+								esc_html__('PCI DSS compliance', 'event_espresso')
+							)
+						)
+					)
+				)
+			);
+		}
+		return new EE_Form_Section_HTML('');
+	}
+
+
+	/**
+	 * _currency_support
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML
+	 * @throws EE_Error
+	 */
+	protected function _currency_support(EE_Payment_Method $payment_method)
+	{
+		if (! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
+			return new EE_Form_Section_HTML(
+				EEH_HTML::table(
+					EEH_HTML::tr(
+						EEH_HTML::th(
+							EEH_HTML::label(
+								EEH_HTML::strong(
+									esc_html__('IMPORTANT', 'event_espresso'),
+									'',
+									'important-notice'
+								)
+							)
+						) .
+						EEH_HTML::td(
+							EEH_HTML::strong(
+								sprintf(
+									esc_html__(
+										'This payment method does not support the currency set on your site (%1$s). Please activate a different payment method or change your site\'s country and associated currency.',
+										'event_espresso'
+									),
+									EE_Config::instance()->currency->code
+								)
+							)
+						)
+					)
+				)
+			);
+		}
+		return new EE_Form_Section_HTML('');
+	}
+
+
+	/**
+	 * _update_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 */
+	protected function _payment_method_settings(EE_Payment_Method $payment_method)
+	{
+		// modify the form, so we only have/show fields that will be implemented for this version
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
+	}
+
+
+	/**
+	 * Simplifies the form to merely reproduce 4.1's gateway settings functionality
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @param string                 $payment_method_name
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 */
+	protected function _simplify_form($form_section, $payment_method_name = '')
+	{
+		if ($form_section instanceof EE_Payment_Method_Form) {
+			$form_section->exclude(
+				array(
+					'PMD_type', // don't want them changing the type
+					'PMD_slug', // or the slug (probably never)
+					'PMD_wp_user', // or the user's ID
+					'Currency' // or the currency, until the rest of EE supports simultaneous currencies
+				)
+			);
+			return $form_section;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.',
+						'event_espresso'
+					),
+					$payment_method_name
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * _update_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML
+	 * @throws EE_Error
+	 */
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method)
+	{
+		$update_button = new EE_Submit_Input(
+			array(
+				'name'       => 'submit',
+				'html_id'    => 'save_' . $payment_method->slug() . '_settings',
+				'default'    => sprintf(
+					esc_html__('Update %s Payment Settings', 'event_espresso'),
+					$payment_method->admin_name()
+				),
+				'html_label' => EEH_HTML::nbsp(),
+			)
+		);
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::no_row(EEH_HTML::br(2)) .
+				EEH_HTML::tr(
+					EEH_HTML::th(esc_html__('Update Settings', 'event_espresso')) .
+					EEH_HTML::td(
+						$update_button->get_html_for_input()
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * _deactivate_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML
+	 */
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method)
+	{
+		$link_text_and_title = sprintf(
+			esc_html__('Deactivate %1$s Payments?', 'event_espresso'),
+			$payment_method->admin_name()
+		);
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::tr(
+					EEH_HTML::th(esc_html__('Deactivate Payment Method', 'event_espresso')) .
+					EEH_HTML::td(
+						EEH_HTML::link(
+							EE_Admin_Page::add_query_args_and_nonce(
+								array(
+									'action'         => 'deactivate_payment_method',
+									'payment_method' => $payment_method->slug(),
+								),
+								EE_PAYMENTS_ADMIN_URL
+							),
+							$link_text_and_title,
+							$link_text_and_title,
+							'deactivate_' . $payment_method->slug(),
+							'button button--secondary'
+						)
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * _activate_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 */
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method)
+	{
+		$link_text_and_title = sprintf(
+			esc_html__('Activate %1$s Payment Method?', 'event_espresso'),
+			$payment_method->admin_name()
+		);
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'activate_' . $payment_method->slug() . '_settings_form',
+				'html_id'         => 'activate_' . $payment_method->slug() . '_settings_form',
+				'action'          => '#',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__Payments_Admin_Page___activate_payment_method_button__form_subsections',
+					array(
+						new EE_Form_Section_HTML(
+							EEH_HTML::table(
+								EEH_HTML::tr(
+									EEH_HTML::td(
+										$payment_method->type_obj()->introductory_html(),
+										'',
+										'',
+										'',
+										'colspan="2"'
+									)
+								) .
+								EEH_HTML::tr(
+									EEH_HTML::th(
+										EEH_HTML::label(esc_html__('Click to Activate ', 'event_espresso'))
+									) .
+									EEH_HTML::td(
+										EEH_HTML::link(
+											EE_Admin_Page::add_query_args_and_nonce(
+												array(
+													'action'              => 'activate_payment_method',
+													'payment_method_type' => $payment_method->type(),
+												),
+												EE_PAYMENTS_ADMIN_URL
+											),
+											$link_text_and_title,
+											$link_text_and_title,
+											'activate_' . $payment_method->slug(),
+											'button button--primary-alt'
+										)
+									)
+								)
+							)
+						),
+					),
+					$payment_method
+				),
+			)
+		);
+	}
+
+
+	/**
+	 * _fine_print
+	 *
+	 * @access protected
+	 * @return EE_Form_Section_HTML
+	 */
+	protected function _fine_print()
+	{
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::tr(
+					EEH_HTML::th() .
+					EEH_HTML::td(
+						EEH_HTML::p(esc_html__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @global WP_User $current_user
+	 */
+	protected function _activate_payment_method()
+	{
+		if (isset($this->_req_data['payment_method_type'])) {
+			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
+			// see if one exists
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()
+													   ->activate_a_payment_method_of_type($payment_method_type);
+			$this->_redirect_after_action(
+				1,
+				'Payment Method',
+				'activated',
+				array('action' => 'default', 'payment_method' => $payment_method->slug())
+			);
+		} else {
+			$this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _deactivate_payment_method()
+	{
+		if (isset($this->_req_data['payment_method'])) {
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
+			// deactivate it
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action(
+				$count_updated,
+				'Payment Method',
+				'deactivated',
+				array('action' => 'default', 'payment_method' => $payment_method_slug)
+			);
+		} else {
+			$this->_redirect_after_action(false, 'Payment Method', 'deactivated', array('action' => 'default'));
+		}
+	}
+
+
+	/**
+	 * Processes the payment method form that was submitted. This is slightly trickier than usual form
+	 * processing because we first need to identify WHICH form was processed and which payment method
+	 * it corresponds to. Once we have done that, we see if the form is valid. If it is, the
+	 * form's data is saved, and we redirect to the default payment methods page, setting the updated payment method
+	 * as the currently-selected one. If it DOESN'T validate, we render the page with the form's errors (in the
+	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _update_payment_method()
+	{
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			// ok let's find which gateway form to use based on the form input
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
+			$correct_pmt_form_to_use = null;
+			$payment_method = null;
+			foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
+				if ($payment_method instanceof EE_Payment_Method) {
+					// get the form and simplify it, like what we do when we display it
+					$pmt_form = $this->_generate_payment_method_settings_form($payment_method);
+					if ($pmt_form->form_data_present_in($this->_req_data)) {
+						$correct_pmt_form_to_use = $pmt_form;
+						break;
+					}
+				}
+			}
+			// if we couldn't find the correct payment method type...
+			if (! $correct_pmt_form_to_use) {
+				EE_Error::add_error(
+					esc_html__(
+						"We could not find which payment method type your form submission related to. Please contact support",
+						'event_espresso'
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				$this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
+			}
+			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
+			if ($correct_pmt_form_to_use->is_valid()) {
+				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection('payment_method_settings');
+				if (! $payment_settings_subform instanceof EE_Payment_Method_Form) {
+					throw new EE_Error(
+						sprintf(
+							esc_html__(
+								'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.',
+								'event_espresso'
+							),
+							'payment_method_settings'
+						)
+					);
+				}
+				$payment_settings_subform->save();
+				/** @var $pm EE_Payment_Method */
+				$this->_redirect_after_action(
+					true,
+					'Payment Method',
+					'updated',
+					array('action' => 'default', 'payment_method' => $payment_method->slug())
+				);
+			} else {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'Payment method of type %s was not saved because there were validation errors. They have been marked in the form',
+							'event_espresso'
+						),
+						$payment_method instanceof EE_Payment_Method ? $payment_method->type_obj()->pretty_name()
+							: esc_html__('"(unknown)"', 'event_espresso')
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * Displays payment settings (not payment METHOD settings, that's _payment_method_settings)
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _payment_settings()
+	{
+		$form = $this->getPaymentSettingsForm();
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_HTML::div(
+			$form->get_html_and_js(),
+			'',
+			'padding'
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 *        _update_payment_settings
+	 *
+	 * @access protected
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _update_payment_settings()
+	{
+		$form = $this->getPaymentSettingsForm();
+		if ($form->was_submitted($this->_req_data)) {
+			$form->receive_form_submission($this->_req_data);
+			if ($form->is_valid()) {
+				/**
+				 * @var $reg_config EE_Registration_Config
+				 */
+				$loader = LoaderFactory::getLoader();
+				$reg_config = $loader->getShared('EE_Registration_Config');
+				$valid_data = $form->valid_data();
+				$reg_config->show_pending_payment_options = $valid_data['show_pending_payment_options'];
+				$reg_config->gateway_log_lifespan = $valid_data['gateway_log_lifespan'];
+			}
+		}
+		EE_Registry::instance()->CFG = apply_filters(
+			'FHEE__Payments_Admin_Page___update_payment_settings__CFG',
+			EE_Registry::instance()->CFG
+		);
+
+		$what = esc_html__('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration(
+			$what,
+			EE_Registry::instance()->CFG,
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		$this->_redirect_after_action(
+			$success,
+			$what,
+			esc_html__('updated', 'event_espresso'),
+			array('action' => 'payment_settings')
+		);
+	}
+
+
+	/**
+	 * Gets the form used for updating payment settings
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function getPaymentSettingsForm()
+	{
+		/**
+		 * @var $reg_config EE_Registration_Config
+		 */
+		$reg_config = LoaderFactory::getLoader()->getShared('EE_Registration_Config');
+		return new EE_Form_Section_Proper(
+			array(
+				'name' => 'payment-settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections' => array(
+					'show_pending_payment_options' => new EE_Yes_No_Input(
+						array(
+							'html_name' => 'show_pending_payment_options',
+							'default' => $reg_config->show_pending_payment_options,
+							'html_help_text' => esc_html__(
+								"If a payment is marked as 'Pending Payment', or if payment is deferred (ie, an offline gateway like Check, Bank, or Invoice is used), then give registrants the option to retry payment. ",
+								'event_espresso'
+							)
+						)
+					),
+					'gateway_log_lifespan' => new EE_Select_Input(
+						$reg_config->gatewayLogLifespanOptions(),
+						array(
+							'html_label_text' => esc_html__('Gateway Logs Lifespan', 'event_espresso'),
+							'html_help_text' => esc_html__('If issues arise with payments being made through a payment gateway, it\'s helpful to log non-sensitive communications with the payment gateway. But it\'s a security responsibility, so it\'s a good idea to not keep them for any longer than necessary.', 'event_espresso'),
+							'default' => $reg_config->gateway_log_lifespan,
+						)
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _payment_log_overview_list_table()
+	{
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	protected function _set_list_table_views_payment_log()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'  => 'all',
+				'label' => esc_html__('View All Logs', 'event_espresso'),
+				'count' => 0,
+			),
+		);
+	}
+
+
+	/**
+	 * @param int  $per_page
+	 * @param int  $current_page
+	 * @param bool $count
+	 * @return array|int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false)
+	{
+		EE_Registry::instance()->load_model('Change_Log');
+		// we may need to do multiple queries (joining differently), so we actually want an array of query params
+		$query_params = array(array('LOG_type' => EEM_Change_Log::type_gateway));
+		// check if they've selected a specific payment method
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
+			$query_params[0]['OR*pm_or_pay_pm'] = array(
+				'Payment.Payment_Method.PMD_ID' => $this->_req_data['_payment_method'],
+				'Payment_Method.PMD_ID'         => $this->_req_data['_payment_method'],
+			);
+		}
+		// take into account search
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%' . str_replace("", "%", $this->_req_data['s']) . '%');
+			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Payment_Method.PMD_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Payment_Method.PMD_admin_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Payment_Method.PMD_type'] = $similarity_string;
+			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment_Method.PMD_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment_Method.PMD_admin_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment_Method.PMD_type'] = $similarity_string;
+			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
+		}
+		if (
+			isset($this->_req_data['payment-filter-start-date'])
+			&& isset($this->_req_data['payment-filter-end-date'])
+		) {
+			// add date
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
+			// make sure our timestamps start and end right at the boundaries for each day
+			$start_date = date('Y-m-d', strtotime($start_date)) . ' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)) . ' 23:59:59';
+			// convert to timestamps
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
+			// makes sure start date is the lowest value and vice versa
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
+			// convert for query
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query(
+				'LOG_time',
+				date('Y-m-d H:i:s', $start_date),
+				'Y-m-d H:i:s'
+			);
+			$end_date   = EEM_Change_Log::instance()->convert_datetime_for_query(
+				'LOG_time',
+				date('Y-m-d H:i:s', $end_date),
+				'Y-m-d H:i:s'
+			);
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
+		}
+		if ($count) {
+			return EEM_Change_Log::instance()->count($query_params);
+		}
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order']))
+				? $this->_req_data['order']
+				: 'DESC';
+			$query_params['order_by'] = array('LOG_time' => $sort);
+		} else {
+			$query_params['order_by'] = array('LOG_time' => 'DESC');
+		}
+		$offset = ($current_page - 1) * $per_page;
+		if (! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
+		}
+		// now they've requested to instead just download the file instead of viewing it.
+		if (isset($this->_req_data['download_results'])) {
+			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
+			header('Content-Disposition: attachment');
+			header("Content-Disposition: attachment; filename=ee_payment_logs_for_" . sanitize_key(site_url()));
+			echo '<h1> '
+				. sprintf(
+					esc_html__('Payment Logs for %1$s', 'event_espresso'),
+					esc_url_raw(site_url())
+				)
+				. '</h1 >';
+			echo '<h3>' . esc_html__('Query:', 'event_espresso') . '</h3>';
+			echo esc_html(var_export($query_params, true));
+			echo '<h3>' . esc_html__('Results:', 'event_espresso') . '</h3>';
+			echo esc_html(var_export($wpdb_results, true));
+			die;
+		}
+		return EEM_Change_Log::instance()->get_all($query_params);
+	}
+
+
+	/**
+	 * Used by usort to RE-sort log query results, because we lose the ordering
+	 * because we're possibly combining the results from two queries
+	 *
+	 * @param EE_Change_Log $logA
+	 * @param EE_Change_Log $logB
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _sort_logs_again($logA, $logB)
+	{
+		$timeA = $logA->get_raw('LOG_time');
+		$timeB = $logB->get_raw('LOG_time');
+		if ($timeA == $timeB) {
+			return 0;
+		}
+		$comparison = $timeA < $timeB ? -1 : 1;
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
+			return $comparison * -1;
+		}
+		return $comparison;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _payment_log_details()
+	{
+		EE_Registry::instance()->load_model('Change_Log');
+		/** @var $payment_log EE_Change_Log */
+		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
+		$payment_method = null;
+		$transaction = null;
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
+				$payment_method = $payment_log->object()->payment_method();
+				$transaction = $payment_log->object()->transaction();
+			} elseif ($payment_log->object() instanceof EE_Payment_Method) {
+				$payment_method = $payment_log->object();
+			} elseif ($payment_log->object() instanceof EE_Transaction) {
+				$transaction = $payment_log->object();
+				$payment_method = $transaction->payment_method();
+			}
+		}
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			array(
+				'payment_log'    => $payment_log,
+				'payment_method' => $payment_method,
+				'transaction'    => $transaction,
+			),
+			true
+		);
+		$this->display_admin_page_with_no_sidebar();
+	}
 }

admin_pages/about/About_Admin_Page.core.php

Indentation +278 added lines, -278 removed lines

@@ -15,132 +15,132 @@ 
  */
 class About_Admin_Page extends EE_Admin_Page
 {
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_ABOUT_PG_SLUG;
-        $this->page_label = esc_html__('About Event Espresso', 'event_espresso');
-        $this->_admin_base_url = EE_ABOUT_ADMIN_URL;
-        $this->_admin_base_path = EE_ABOUT_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ajax goes here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_labels = array();
-        $this->_admin_page_title = $this->page_label;
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default' => array(
-                'func'       => '_overview',
-                'capability' => 'manage_options',
-            ),
-            // 'overview' => '_overview',
-            // 'func' => '_overview',
-            // 'capability' => 'ee_read_ee'
-            // ),
-            'credits' => array(
-                'func'       => '_credits',
-                'capability' => 'manage_options',
-            ),
-
-            'decafvpro' => array(
-                'func'       => '_decafvpro',
-                'capability' => 'manage_options',
-            ),
-            'reviews'   => array(
-                'func'       => '_reviews',
-                'capability' => 'manage_options',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            /*'default' => array(
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_ABOUT_PG_SLUG;
+		$this->page_label = esc_html__('About Event Espresso', 'event_espresso');
+		$this->_admin_base_url = EE_ABOUT_ADMIN_URL;
+		$this->_admin_base_path = EE_ABOUT_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ajax goes here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_labels = array();
+		$this->_admin_page_title = $this->page_label;
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default' => array(
+				'func'       => '_overview',
+				'capability' => 'manage_options',
+			),
+			// 'overview' => '_overview',
+			// 'func' => '_overview',
+			// 'capability' => 'ee_read_ee'
+			// ),
+			'credits' => array(
+				'func'       => '_credits',
+				'capability' => 'manage_options',
+			),
+
+			'decafvpro' => array(
+				'func'       => '_decafvpro',
+				'capability' => 'manage_options',
+			),
+			'reviews'   => array(
+				'func'       => '_reviews',
+				'capability' => 'manage_options',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			/*'default' => array(
                 'nav' => array(
                     'label' => esc_html__('What\'s New', 'event_espresso'),
                     'order' => 10),
                 'require_nonce' => FALSE
                 ),*/
-            // 'overview' => array(
-            'default' => array(
-                'nav'           => array(
-                    'label' => esc_html__('About', 'event_espresso'),
-                    'icon' => 'dashicons-welcome-learn-more',
-                    'order' => 20,
-                ),
-                'require_nonce' => false,
-            ),
-            'credits' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Credits', 'event_espresso'),
-                    'icon' => 'dashicons-thumbs-up',
-                    'order' => 30,
-                ),
-                'require_nonce' => false,
-            ),
-
-            'decafvpro' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Decaf vs Regular', 'event_espresso'),
-                    'icon' => 'dashicons-editor-code',
-                    'order' => 40,
-                ),
-                'require_nonce' => false,
-            ),
-            'reviews'   => array(
-                'nav'           => array(
-                    'label' => esc_html__('Reviews', 'event_espresso'),
-                    'icon' => 'dashicons-star-filled',
-                    'order' => 50,
-                ),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    // none of the below group are currently used for Support pages
-    protected function _add_screen_options()
-    {
-    }
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-    public function admin_init()
-    {
-    }
-
-    public function admin_notices()
-    {
-    }
-
-    public function admin_footer_scripts()
-    {
-    }
-
-    public function load_scripts_styles()
-    {
-    }
-
-
-    protected function _whats_new()
-    {
-        /*$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
+			// 'overview' => array(
+			'default' => array(
+				'nav'           => array(
+					'label' => esc_html__('About', 'event_espresso'),
+					'icon' => 'dashicons-welcome-learn-more',
+					'order' => 20,
+				),
+				'require_nonce' => false,
+			),
+			'credits' => array(
+				'nav'           => array(
+					'label' => esc_html__('Credits', 'event_espresso'),
+					'icon' => 'dashicons-thumbs-up',
+					'order' => 30,
+				),
+				'require_nonce' => false,
+			),
+
+			'decafvpro' => array(
+				'nav'           => array(
+					'label' => esc_html__('Decaf vs Regular', 'event_espresso'),
+					'icon' => 'dashicons-editor-code',
+					'order' => 40,
+				),
+				'require_nonce' => false,
+			),
+			'reviews'   => array(
+				'nav'           => array(
+					'label' => esc_html__('Reviews', 'event_espresso'),
+					'icon' => 'dashicons-star-filled',
+					'order' => 50,
+				),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	// none of the below group are currently used for Support pages
+	protected function _add_screen_options()
+	{
+	}
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+	public function admin_init()
+	{
+	}
+
+	public function admin_notices()
+	{
+	}
+
+	public function admin_footer_scripts()
+	{
+	}
+
+	public function load_scripts_styles()
+	{
+	}
+
+
+	protected function _whats_new()
+	{
+		/*$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
         $steps = $steps !== FALSE ? $steps : '';
         $this->_admin_page_title = sprintf( esc_html__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
         $settings_message = $steps;
@@ -148,168 +148,168 @@ 
         $template = EE_ABOUT_TEMPLATE_PATH . 'whats_new.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
         $this->display_about_admin_page();*/
-    }
+	}
 
 
-    protected function _overview()
-    {
-        /*$this->_template_args['admin_page_title'] = esc_html__('About Event Espresso', 'event_espresso');
+	protected function _overview()
+	{
+		/*$this->_template_args['admin_page_title'] = esc_html__('About Event Espresso', 'event_espresso');
         $this->_template_args['admin_page_subtitle'] = esc_html__('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
         $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
         $this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
         $this->display_about_admin_page();*/
 
-        // Copied from _whats_new()
-        $steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
-            ? $this->_get_started_steps() : false;
-        $steps = $steps !== false ? $steps : '';
-        $this->_admin_page_title = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $settings_message = $steps;
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
-            'event_espresso'
-        ) . $settings_message;
-        $template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-
-    protected function _get_started_steps()
-    {
-        $steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
-        $step_one = '<p>'
-                    . sprintf(
-                        esc_html__(
-                            '%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.',
-                            'event_espresso'
-                        ),
-                        '<strong>',
-                        '</strong>',
-                        '<a href="admin.php?page=espresso_general_settings">',
-                        '</a>'
-                    ) . '</strong></p>';
-        $step_two = '<p>'
-                    . sprintf(
-                        esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
-                        '<strong>',
-                        '</strong>',
-                        '<a href="admin.php?page=espresso_payment_settings">',
-                        '</a>'
-                    ) . '</strong></p>';
-        $step_three = '<p>'
-                      . sprintf(
-                          esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
-                          '<strong>',
-                          '</strong>',
-                          '<a href="admin.php?page=espresso_events&action=create_new">',
-                          '</a>'
-                      ) . '</strong></p>';
-
-        // done?
-        $done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
-        $active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(
-            EEM_Payment_Method::scope_cart,
-            array(array('PMD_type' => 'Invoice'))
-        );
-        $active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
-        // done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
-        // if only the invoice is active but it's clearly been updated
-        $done_step_two = $active_pms_count > 1 ||
-                         ($active_pms_count === 1 && ! $active_invoice_pm) ||
-                         ($active_invoice_pm instanceof EE_Payment_Method && (
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_name', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_email', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('pdf_payee_address', true, '') ||
-                                 $active_invoice_pm->get_extra_meta('page_extra_info', true, '')
-                             )
-                         );
-        $done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? true : false;
-
-        // if ALL steps are done, let's just return FALSE so we don't display anything
-        if ($done_step_one && $done_step_two && $done_step_three) {
-            return false;
-        }
-
-        // now let's put it together
-        $steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
-        $steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
-        $steps .= sprintf(
-            '%s' . $step_three . '%s',
-            $done_step_three ? '<strike>' : '',
-            $done_step_three ? '</strike>' : ''
-        );
-
-        return $steps;
-    }
-
-
-    protected function _credits()
-    {
-        $this->_template_args['admin_page_title'] = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
-            'event_espresso'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-
-    protected function _decafvpro()
-    {
-        $this->_template_args['admin_page_title'] = sprintf(
-            esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
-            EVENT_ESPRESSO_VERSION
-        );
-        $this->_template_args['admin_page_subtitle'] = sprintf(
-            esc_html__(
-                'Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s',
-                'event_espresso'
-            ),
-            '<em>',
-            '</em>',
-            '<strong>',
-            '</strong>'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
-
-    protected function _reviews()
-    {
-        $this->_template_args['admin_page_title'] = esc_html__('Rave Reviews About Event Espresso 4', 'event_espresso');
-        $this->_template_args['admin_page_subtitle'] = esc_html__(
-            'At Event Espresso, customer satisfaction is our ultimate goal.',
-            'event_espresso'
-        );
-        $template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
-        $this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
-            $template,
-            $this->_template_args,
-            true
-        );
-        $this->display_about_admin_page();
-    }
+		// Copied from _whats_new()
+		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance
+			? $this->_get_started_steps() : false;
+		$steps = $steps !== false ? $steps : '';
+		$this->_admin_page_title = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$settings_message = $steps;
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.',
+			'event_espresso'
+		) . $settings_message;
+		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+
+	protected function _get_started_steps()
+	{
+		$steps = '<h2>' . esc_html__('Getting Started', 'event_espresso') . '</h2>';
+		$step_one = '<p>'
+					. sprintf(
+						esc_html__(
+							'%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.',
+							'event_espresso'
+						),
+						'<strong>',
+						'</strong>',
+						'<a href="admin.php?page=espresso_general_settings">',
+						'</a>'
+					) . '</strong></p>';
+		$step_two = '<p>'
+					. sprintf(
+						esc_html__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'),
+						'<strong>',
+						'</strong>',
+						'<a href="admin.php?page=espresso_payment_settings">',
+						'</a>'
+					) . '</strong></p>';
+		$step_three = '<p>'
+					  . sprintf(
+						  esc_html__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'),
+						  '<strong>',
+						  '</strong>',
+						  '<a href="admin.php?page=espresso_events&action=create_new">',
+						  '</a>'
+					  ) . '</strong></p>';
+
+		// done?
+		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? false : true;
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(
+			EEM_Payment_Method::scope_cart,
+			array(array('PMD_type' => 'Invoice'))
+		);
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		// done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
+		// if only the invoice is active but it's clearly been updated
+		$done_step_two = $active_pms_count > 1 ||
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', true, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', true, '') ||
+								 $active_invoice_pm->get_extra_meta('page_extra_info', true, '')
+							 )
+						 );
+		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? true : false;
+
+		// if ALL steps are done, let's just return FALSE so we don't display anything
+		if ($done_step_one && $done_step_two && $done_step_three) {
+			return false;
+		}
+
+		// now let's put it together
+		$steps .= sprintf('%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+		$steps .= sprintf('%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+		$steps .= sprintf(
+			'%s' . $step_three . '%s',
+			$done_step_three ? '<strike>' : '',
+			$done_step_three ? '</strike>' : ''
+		);
+
+		return $steps;
+	}
+
+
+	protected function _credits()
+	{
+		$this->_template_args['admin_page_title'] = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.',
+			'event_espresso'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+
+	protected function _decafvpro()
+	{
+		$this->_template_args['admin_page_title'] = sprintf(
+			esc_html__('Welcome to Event Espresso %s', 'event_espresso'),
+			EVENT_ESPRESSO_VERSION
+		);
+		$this->_template_args['admin_page_subtitle'] = sprintf(
+			esc_html__(
+				'Event Espresso lets you focus on doing %swhat you love%s — %sorganizing your events%s',
+				'event_espresso'
+			),
+			'<em>',
+			'</em>',
+			'<strong>',
+			'</strong>'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'decafvpro.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
+
+	protected function _reviews()
+	{
+		$this->_template_args['admin_page_title'] = esc_html__('Rave Reviews About Event Espresso 4', 'event_espresso');
+		$this->_template_args['admin_page_subtitle'] = esc_html__(
+			'At Event Espresso, customer satisfaction is our ultimate goal.',
+			'event_espresso'
+		);
+		$template = EE_ABOUT_TEMPLATE_PATH . 'reviews.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template(
+			$template,
+			$this->_template_args,
+			true
+		);
+		$this->display_about_admin_page();
+	}
 }

admin_pages/about/templates/credits.template.php

Indentation +86 added lines, -86 removed lines

@@ -1,61 +1,61 @@ 
 <?php
 $tEEm_members = [
-    esc_html__('Founders', 'event_espresso') => [
-        'garth-koyle' => [
-            'email' => 'garth@eventespresso.com',
-            'name'  => 'Garth Koyle',
-            'desc'  => esc_html__('Co-Founder', 'event_espresso'),
-        ],
-    ],
-    esc_html__('Core Developers', 'event_espresso') => [
-        'brent-christensen' => [
-            'email' => 'brent@eventespresso.com',
-            'name'  => 'Brent Christensen',
-            'desc'  => esc_html__('Lead Developer', 'event_espresso'),
-        ],
-        'nazar-kolivoshka' => [
-            'email' => 'nazar@eventespresso.com',
-            'name'  => 'Nazar Kolivoshka',
-            'desc'  => esc_html__('Core Developer', 'event_espresso'),
-        ],
-        'marlon-hario' => [
-            'email' => 'marlon@eventespresso.com',
-            'name'  => 'Marlon Hario',
-            'desc'  => esc_html__('Core Developer', 'event_espresso'),
-        ],
-        'hossein-rafiei' => [
-            'email' => 'hossein@eventespresso.com',
-            'name'  => 'Hossein Rafiei',
-            'desc'  => esc_html__('Core Developer', 'event_espresso'),
-        ],
-    ],
-    esc_html__('Support Staff', 'event_espresso') => [
-        'tony-warwick' => [
-            'email' => 'tony@eventespresso.com',
-            'name'  => 'Tony Warwick',
-            'desc'  => esc_html__('Support', 'event_espresso'),
-        ],
-        'lorenzo-caum' => [
-            'email' => 'lorenzo@eventespresso.com',
-            'name'  => 'Lorenzo Caum',
-            'desc'  => esc_html__('Sales & Support', 'event_espresso'),
-        ],
-        'janice-gutierrez' => [
-            'email' => 'janice@eventespresso.com',
-            'name'  => 'Janice Gutierrez',
-            'desc'  => esc_html__('Support', 'event_espresso'),
-        ],
-        'chinny-love-verana' => [
-            'email' => 'chinny@eventespresso.com',
-            'name'  => 'Chinny Love Verana',
-            'desc'  => esc_html__('Sales & Support', 'event_espresso'),
-        ],
-    ],
+	esc_html__('Founders', 'event_espresso') => [
+		'garth-koyle' => [
+			'email' => 'garth@eventespresso.com',
+			'name'  => 'Garth Koyle',
+			'desc'  => esc_html__('Co-Founder', 'event_espresso'),
+		],
+	],
+	esc_html__('Core Developers', 'event_espresso') => [
+		'brent-christensen' => [
+			'email' => 'brent@eventespresso.com',
+			'name'  => 'Brent Christensen',
+			'desc'  => esc_html__('Lead Developer', 'event_espresso'),
+		],
+		'nazar-kolivoshka' => [
+			'email' => 'nazar@eventespresso.com',
+			'name'  => 'Nazar Kolivoshka',
+			'desc'  => esc_html__('Core Developer', 'event_espresso'),
+		],
+		'marlon-hario' => [
+			'email' => 'marlon@eventespresso.com',
+			'name'  => 'Marlon Hario',
+			'desc'  => esc_html__('Core Developer', 'event_espresso'),
+		],
+		'hossein-rafiei' => [
+			'email' => 'hossein@eventespresso.com',
+			'name'  => 'Hossein Rafiei',
+			'desc'  => esc_html__('Core Developer', 'event_espresso'),
+		],
+	],
+	esc_html__('Support Staff', 'event_espresso') => [
+		'tony-warwick' => [
+			'email' => 'tony@eventespresso.com',
+			'name'  => 'Tony Warwick',
+			'desc'  => esc_html__('Support', 'event_espresso'),
+		],
+		'lorenzo-caum' => [
+			'email' => 'lorenzo@eventespresso.com',
+			'name'  => 'Lorenzo Caum',
+			'desc'  => esc_html__('Sales & Support', 'event_espresso'),
+		],
+		'janice-gutierrez' => [
+			'email' => 'janice@eventespresso.com',
+			'name'  => 'Janice Gutierrez',
+			'desc'  => esc_html__('Support', 'event_espresso'),
+		],
+		'chinny-love-verana' => [
+			'email' => 'chinny@eventespresso.com',
+			'name'  => 'Chinny Love Verana',
+			'desc'  => esc_html__('Sales & Support', 'event_espresso'),
+		],
+	],
 ];
 
 function espressoPerson($id, $email, $name, $desc): string
 {
-    return '
+	return '
     <li class="ee-card ee-credits-person" id="ee-person-' . $id . '">
         <a href="' . esp_gravatar_profile($email) . '" target="_blank">
             ' . esp_gravatar_image($email, $name) . '
@@ -69,15 +69,15 @@ 
 
 function esp_gravatar_profile($email)
 {
-    return esc_url_raw('https://www.gravatar.com/' . md5($email));
+	return esc_url_raw('https://www.gravatar.com/' . md5($email));
 }
 
 function esp_gravatar_image($email, $name)
 {
-    $email = md5($email);
-    $name  = esc_attr($name);
-    $url   = esc_url_raw("https://0.gravatar.com/avatar/{$email}?s=60");
-    return "<img src='{$url}' class='gravatar' alt='{$name}'/>";
+	$email = md5($email);
+	$name  = esc_attr($name);
+	$url   = esc_url_raw("https://0.gravatar.com/avatar/{$email}?s=60");
+	return "<img src='{$url}' class='gravatar' alt='{$name}'/>";
 }
 
 ?>
@@ -87,38 +87,38 @@ 
 
         <h4>
             <?php esc_html_e(
-                'Event Espresso is created by an international team of passionate individuals with a drive to empower your events!',
-                'event_espresso'
-            ); ?>
+				'Event Espresso is created by an international team of passionate individuals with a drive to empower your events!',
+				'event_espresso'
+			); ?>
         </h4>
 
         <div class='ee-credits-tEEm'>
             <?php
-            foreach ($tEEm_members as $tEEm => $members) {
-                echo '
+			foreach ($tEEm_members as $tEEm => $members) {
+				echo '
             <h3 class="wp-people-group">' . $tEEm . '</h3>
             <ul class="ee-card-grid ee-card-grid-4-cols" id="' . sanitize_key($tEEm) . '">';
-                foreach ($members as $id => $person) {
-                    echo espressoPerson($id, $person['email'], $person['name'], $person['desc']);
-                }
-                echo '
+				foreach ($members as $id => $person) {
+					echo espressoPerson($id, $person['email'], $person['name'], $person['desc']);
+				}
+				echo '
             </ul>';
-            }
-            ?>
+			}
+			?>
         </div>
 
         <h3 class="wp-people-group"><?php esc_html_e('Contributor Recognition', 'event_espresso'); ?></h3>
         <p class="description">
             <?php
-            printf(
-                esc_html__(
-                    'For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.',
-                    'event_espresso'
-                ),
-                '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub" target="_blank">',
-                '</a>'
-            );
-            ?>
+			printf(
+				esc_html__(
+					'For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.',
+					'event_espresso'
+				),
+				'<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub" target="_blank">',
+				'</a>'
+			);
+			?>
         </p>
         <p class="wp-credits-list">
         <ul>
@@ -133,15 +133,15 @@ 
         <h3 class="wp-people-group"><?php esc_html_e('External Libraries', 'event_espresso'); ?></h3>
         <p class="description">
             <?php
-            printf(
-                esc_html__(
-                    'Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:',
-                    'event_espresso'
-                ),
-                '<a href="credits.php">',
-                '</a>'
-            );
-            ?>
+			printf(
+				esc_html__(
+					'Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:',
+					'event_espresso'
+				),
+				'<a href="credits.php">',
+				'</a>'
+			);
+			?>
         </p>
         <p class="wp-credits-list">
             <a href="https://openexchangerates.github.io/accounting.js/" target='_blank'>accounting.js</a>,

Spacing +8 added lines, -8 removed lines

@@ -56,20 +56,20 @@ 
 function espressoPerson($id, $email, $name, $desc): string
 {
     return '
-    <li class="ee-card ee-credits-person" id="ee-person-' . $id . '">
-        <a href="' . esp_gravatar_profile($email) . '" target="_blank">
-            ' . esp_gravatar_image($email, $name) . '
+    <li class="ee-card ee-credits-person" id="ee-person-' . $id.'">
+        <a href="' . esp_gravatar_profile($email).'" target="_blank">
+            ' . esp_gravatar_image($email, $name).'
         </a>
         <p>
-            <a class="web" href="' . esp_gravatar_profile($email) . '" target="_blank">' . $name . '</a>
-            <span class="title">' . $desc . '</span>
+            <a class="web" href="' . esp_gravatar_profile($email).'" target="_blank">'.$name.'</a>
+            <span class="title">' . $desc.'</span>
         </p>
     </li>';
 }
 
 function esp_gravatar_profile($email)
 {
-    return esc_url_raw('https://www.gravatar.com/' . md5($email));
+    return esc_url_raw('https://www.gravatar.com/'.md5($email));
 }
 
 function esp_gravatar_image($email, $name)
@@ -96,8 +96,8 @@ 
             <?php
             foreach ($tEEm_members as $tEEm => $members) {
                 echo '
-            <h3 class="wp-people-group">' . $tEEm . '</h3>
-            <ul class="ee-card-grid ee-card-grid-4-cols" id="' . sanitize_key($tEEm) . '">';
+            <h3 class="wp-people-group">' . $tEEm.'</h3>
+            <ul class="ee-card-grid ee-card-grid-4-cols" id="' . sanitize_key($tEEm).'">';
                 foreach ($members as $id => $person) {
                     echo espressoPerson($id, $person['email'], $person['name'], $person['desc']);
                 }

admin_pages/maintenance/Maintenance_Admin_Page.core.php

Indentation +952 added lines, -952 removed lines

@@ -14,956 +14,956 @@
  */
 class Maintenance_Admin_Page extends EE_Admin_Page
 {
-    /**
-     * @var EE_Data_Migration_Manager
-     */
-    protected $migration_manager;
-
-    /**
-     * @var EE_Maintenance_Mode
-     */
-    protected $maintenance_mode;
-
-    /**
-     * @var EE_Form_Section_Proper
-     */
-    protected $datetime_fix_offset_form;
-
-
-    /**
-     * @param bool $routing
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct($routing = true)
-    {
-        $this->migration_manager = EE_Data_Migration_Manager::instance();
-        $this->maintenance_mode  = EE_Maintenance_Mode::instance();
-        parent::__construct($routing);
-    }
-
-
-    protected function _init_page_props()
-    {
-        $this->page_slug        = EE_MAINTENANCE_PG_SLUG;
-        $this->page_label       = EE_MAINTENANCE_LABEL;
-        $this->_admin_base_url  = EE_MAINTENANCE_ADMIN_URL;
-        $this->_admin_base_path = EE_MAINTENANCE_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_migration_step', [$this, 'migration_step']);
-        add_action('wp_ajax_add_error_to_migrations_ran', [$this, 'add_error_to_migrations_ran']);
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = EE_MAINTENANCE_LABEL;
-        $this->_labels           = [
-            'buttons' => [
-                'reset_reservations' => esc_html__('Reset Ticket and Datetime Reserved Counts', 'event_espresso'),
-                'reset_capabilities' => esc_html__('Reset Event Espresso Capabilities', 'event_espresso'),
-            ],
-        ];
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = [
-            'default'                             => [
-                'func'       => '_maintenance',
-                'capability' => 'manage_options',
-            ],
-            'change_maintenance_level'            => [
-                'func'       => '_change_maintenance_level',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'system_status'                       => [
-                'func'       => '_system_status',
-                'capability' => 'manage_options',
-            ],
-            'download_system_status'              => [
-                'func'       => '_download_system_status',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'send_migration_crash_report'         => [
-                'func'       => '_send_migration_crash_report',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'confirm_migration_crash_report_sent' => [
-                'func'       => '_confirm_migration_crash_report_sent',
-                'capability' => 'manage_options',
-            ],
-            'data_reset'                          => [
-                'func'       => '_data_reset_and_delete',
-                'capability' => 'manage_options',
-            ],
-            'reset_db'                            => [
-                'func'       => '_reset_db',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-                'args'       => ['nuke_old_ee4_data' => true],
-            ],
-            'start_with_fresh_ee4_db'             => [
-                'func'       => '_reset_db',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-                'args'       => ['nuke_old_ee4_data' => false],
-            ],
-            'delete_db'                           => [
-                'func'       => '_delete_db',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'rerun_migration_from_ee3'            => [
-                'func'       => '_rerun_migration_from_ee3',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'reset_reservations'                  => [
-                'func'       => '_reset_reservations',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'reset_capabilities'                  => [
-                'func'       => '_reset_capabilities',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'reattempt_migration'                 => [
-                'func'       => '_reattempt_migration',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'datetime_tools'                      => [
-                'func'       => '_datetime_tools',
-                'capability' => 'manage_options',
-            ],
-            'run_datetime_offset_fix'             => [
-                'func'               => '_apply_datetime_offset',
-                'noheader'           => true,
-                'headers_sent_route' => 'datetime_tools',
-                'capability'         => 'manage_options',
-            ],
-        ];
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = [
-            'default'        => [
-                'nav'           => [
-                    'label' => esc_html__('Maintenance', 'event_espresso'),
-                    'icon' => 'dashicons-admin-tools',
-                    'order' => 10,
-                ],
-                'require_nonce' => false,
-            ],
-            'data_reset'     => [
-                'nav'           => [
-                    'label' => esc_html__('Reset/Delete Data', 'event_espresso'),
-                    'icon' => 'dashicons-trash',
-                    'order' => 20,
-                ],
-                'require_nonce' => false,
-            ],
-            'datetime_tools' => [
-                'nav'           => [
-                    'label' => esc_html__('Datetime Utilities', 'event_espresso'),
-                    'icon' => 'dashicons-calendar-alt',
-                    'order' => 25,
-                ],
-                'require_nonce' => false,
-            ],
-            'system_status'  => [
-                'nav'           => [
-                    'label' => esc_html__("System Information", "event_espresso"),
-                    'icon' => 'dashicons-info',
-                    'order' => 30,
-                ],
-                'require_nonce' => false,
-            ],
-        ];
-    }
-
-
-    /**
-     * default maintenance page.
-     * If we're in maintenance mode level 2, then we need to show the migration scripts and all that UI.
-     *
-     * @throws EE_Error
-     */
-    public function _maintenance()
-    {
-        $show_maintenance_switch         = true;
-        $show_backup_db_text             = false;
-        $show_migration_progress         = false;
-        $script_names                    = [];
-        $addons_should_be_upgraded_first = false;
-        // it all depends on if we're in maintenance model level 1 (frontend-only) or
-        // level 2 (everything except maintenance page)
-        try {
-            // get the current maintenance level and check if
-            // we are removed
-            $mMode_level  = $this->maintenance_mode->level();
-            $placed_in_mm = $this->maintenance_mode->set_maintenance_mode_if_db_old();
-            if ($mMode_level == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm) {
-                // we just took the site out of maintenance mode, so notify the user.
-                // unfortunately this message appears to be echoed on the NEXT page load...
-                // oh well, we should really be checking for this on addon deactivation anyways
-                EE_Error::add_attention(
-                    esc_html__(
-                        'Site taken out of maintenance mode because no data migration scripts are required',
-                        'event_espresso'
-                    )
-                );
-                $this->_process_notices(['page' => 'espresso_maintenance_settings']);
-            }
-            // in case an exception is thrown while trying to handle migrations
-            if ($mMode_level === EE_Maintenance_Mode::level_2_complete_maintenance) {
-                $show_maintenance_switch = false;
-                $show_migration_progress = true;
-                if (isset($this->_req_data['continue_migration'])) {
-                    $show_backup_db_text = false;
-                } else {
-                    $show_backup_db_text = true;
-                }
-                $scripts_needing_to_run          =
-                    $this->migration_manager->check_for_applicable_data_migration_scripts();
-                $addons_should_be_upgraded_first = $this->migration_manager->addons_need_updating();
-                $script_names                    = [];
-                $current_script                  = null;
-                foreach ($scripts_needing_to_run as $script) {
-                    if ($script instanceof EE_Data_Migration_Script_Base) {
-                        if (! $current_script) {
-                            $current_script = $script;
-                            $current_script->migration_page_hooks();
-                        }
-                        $script_names[] = $script->pretty_name();
-                    }
-                }
-            }
-            $most_recent_migration = $this->migration_manager->get_last_ran_script(true);
-            $exception_thrown      = false;
-        } catch (EE_Error $e) {
-            $this->migration_manager->add_error_to_migrations_ran($e->getMessage());
-            // now, just so we can display the page correctly, make an error migration script stage object
-            // and also put the error on it. It only persists for the duration of this request
-            $most_recent_migration = new EE_DMS_Unknown_1_0_0();
-            $most_recent_migration->add_error($e->getMessage());
-            $exception_thrown = true;
-        }
-        $current_db_state = $this->migration_manager->ensure_current_database_state_is_set();
-        $current_db_state = str_replace('.decaf', '', $current_db_state);
-        if (
-            $exception_thrown
-            || (
-                $most_recent_migration instanceof EE_Data_Migration_Script_Base
-                && $most_recent_migration->is_broken()
-            )
-        ) {
-            $this->_template_path                =
-                EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
-            $this->_template_args['support_url'] = 'https://eventespresso.com/support/forums/';
-            $this->_template_args['next_url']    = EEH_URL::add_query_args_and_nonce(
-                [
-                    'action'  => 'confirm_migration_crash_report_sent',
-                    'success' => '0',
-                ],
-                EE_MAINTENANCE_ADMIN_URL
-            );
-        } elseif ($addons_should_be_upgraded_first) {
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
-        } else {
-            if (
-                $most_recent_migration instanceof EE_Data_Migration_Script_Base
-                && $most_recent_migration->can_continue()
-            ) {
-                $show_backup_db_text                    = false;
-                $show_continue_current_migration_script = true;
-                $show_most_recent_migration             = true;
-            } elseif (isset($this->_req_data['continue_migration'])) {
-                $show_most_recent_migration             = true;
-                $show_continue_current_migration_script = false;
-            } else {
-                $show_most_recent_migration             = false;
-                $show_continue_current_migration_script = false;
-            }
-            if (isset($current_script)) {
-                $migrates_to          = $current_script->migrates_to_version();
-                $plugin_slug          = $migrates_to['slug'];
-                $new_version          = $migrates_to['version'];
-                $this->_template_args = array_merge(
-                    $this->_template_args,
-                    [
-                        'current_db_state' => sprintf(
-                            esc_html__("EE%s (%s)", "event_espresso"),
-                            isset($current_db_state[ $plugin_slug ]) ? $current_db_state[ $plugin_slug ] : 3,
-                            $plugin_slug
-                        ),
-                        'next_db_state'    => sprintf(
-                            esc_html__("EE%s (%s)", 'event_espresso'),
-                            $new_version,
-                            $plugin_slug
-                        ),
-                    ]
-                );
-            } else {
-                $this->_template_args['current_db_state'] = null;
-                $this->_template_args['next_db_state']    = null;
-            }
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
-            $this->_template_args = array_merge(
-                $this->_template_args,
-                [
-                    'show_most_recent_migration'             => $show_most_recent_migration,
-                    // flag for showing the most recent migration's status and/or errors
-                    'show_migration_progress'                => $show_migration_progress,
-                    // flag for showing the option to run migrations and see their progress
-                    'show_backup_db_text'                    => $show_backup_db_text,
-                    // flag for showing text telling the user to back up their DB
-                    'show_maintenance_switch'                => $show_maintenance_switch,
-                    // flag for showing the option to change maintenance mode between levels 0 and 1
-                    'script_names'                           => $script_names,
-                    // array of names of scripts that have run
-                    'show_continue_current_migration_script' => $show_continue_current_migration_script,
-                    // flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
-                    'reset_db_page_link'                     => EE_Admin_Page::add_query_args_and_nonce(
-                        ['action' => 'reset_db'],
-                        EE_MAINTENANCE_ADMIN_URL
-                    ),
-                    'data_reset_page'                        => EE_Admin_Page::add_query_args_and_nonce(
-                        ['action' => 'data_reset'],
-                        EE_MAINTENANCE_ADMIN_URL
-                    ),
-                    'update_migration_script_page_link'      => EE_Admin_Page::add_query_args_and_nonce(
-                        ['action' => 'change_maintenance_level'],
-                        EE_MAINTENANCE_ADMIN_URL
-                    ),
-                    'ultimate_db_state'                      => sprintf(
-                        esc_html__("EE%s", 'event_espresso'),
-                        espresso_version()
-                    ),
-                ]
-            );
-        }
-        $this->_template_args['most_recent_migration'] =
-            $most_recent_migration;// the actual most recently ran migration
-        // now render the migration options part, and put it in a variable
-        $migration_options_template_file                = apply_filters(
-            'FHEE__ee_migration_page__migration_options_template',
-            EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee4.template.php'
-        );
-        $migration_options_html                         = EEH_Template::display_template(
-            $migration_options_template_file,
-            $this->_template_args,
-            true
-        );
-        $this->_template_args['migration_options_html'] = $migration_options_html;
-        $this->_template_args['admin_page_content']     = EEH_Template::display_template(
-            $this->_template_path,
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * returns JSON and executes another step of the currently-executing data migration (called via ajax)
-     *
-     * @throws EE_Error
-     */
-    public function migration_step()
-    {
-        $this->_template_args['data'] = $this->migration_manager->response_to_migration_ajax_request();
-        $this->_return_json();
-    }
-
-
-    /**
-     * Can be used by js when it notices a response with HTML in it in order
-     * to log the malformed response
-     *
-     * @throws EE_Error
-     */
-    public function add_error_to_migrations_ran()
-    {
-        $this->migration_manager->add_error_to_migrations_ran($this->_req_data['message']);
-        $this->_template_args['data'] = ['ok' => true];
-        $this->_return_json();
-    }
-
-
-    /**
-     * changes the maintenance level, provided there are still no migration scripts that should run
-     *
-     * @throws EE_Error
-     */
-    public function _change_maintenance_level()
-    {
-        $new_level = absint($this->_req_data['maintenance_mode_level']);
-        if (! $this->migration_manager->check_for_applicable_data_migration_scripts()) {
-            $this->maintenance_mode->set_maintenance_level($new_level);
-            $success = true;
-        } else {
-            $this->maintenance_mode->set_maintenance_mode_if_db_old();
-            $success = false;
-        }
-        $this->_redirect_after_action($success, 'Maintenance Mode', esc_html__("Updated", "event_espresso"));
-    }
-
-
-    /**
-     * a tab with options for resetting and/or deleting EE data
-     *
-     * @throws EE_Error
-     * @throws DomainException
-     */
-    public function _data_reset_and_delete()
-    {
-        $this->_template_path                              =
-            EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
-        $this->_template_args['reset_reservations_button'] = $this->get_action_link_or_button(
-            'reset_reservations',
-            'reset_reservations',
-            [],
-            'button button--caution ee-confirm'
-        );
-        $this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button(
-            'reset_capabilities',
-            'reset_capabilities',
-            [],
-            'button button--caution ee-confirm'
-        );
-        $this->_template_args['delete_db_url']             = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'delete_db'],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['reset_db_url']              = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'reset_db'],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['admin_page_content']        = EEH_Template::display_template(
-            $this->_template_path,
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_no_sidebar();
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _reset_reservations()
-    {
-        if (EED_Ticket_Sales_Monitor::reset_reservation_counts()) {
-            EE_Error::add_success(
-                esc_html__(
-                    'Ticket and datetime reserved counts have been successfully reset.',
-                    'event_espresso'
-                )
-            );
-        } else {
-            EE_Error::add_success(
-                esc_html__(
-                    'Ticket and datetime reserved counts were correct and did not need resetting.',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->_redirect_after_action(true, '', '', ['action' => 'data_reset'], true);
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _reset_capabilities()
-    {
-        EE_Registry::instance()->CAP->init_caps(true);
-        EE_Error::add_success(
-            esc_html__(
-                'Default Event Espresso capabilities have been restored for all current roles.',
-                'event_espresso'
-            )
-        );
-        $this->_redirect_after_action(false, '', '', ['action' => 'data_reset'], true);
-    }
-
-
-    /**
-     * resets the DMSs, so we can attempt to continue migrating after a fatal error
-     * (only a good idea when someone has somehow tried ot fix whatever caused
-     * the fatal error in teh first place)
-     *
-     * @throws EE_Error
-     */
-    protected function _reattempt_migration()
-    {
-        $this->migration_manager->reattempt();
-        $this->_redirect_after_action(false, '', '', ['action' => 'default'], true);
-    }
-
-
-    /**
-     * shows the big ol' System Information page
-     *
-     * @throws EE_Error
-     */
-    public function _system_status()
-    {
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
-        $this->_template_args['system_stati']               = EEM_System_Status::instance()->get_system_stati();
-        $this->_template_args['download_system_status_url'] = EE_Admin_Page::add_query_args_and_nonce(
-            [
-                'action' => 'download_system_status',
-            ],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['admin_page_content']         = EEH_Template::display_template(
-            $this->_template_path,
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_no_sidebar();
-    }
-
-
-    /**
-     * Downloads an HTML file of the system status that can be easily stored or emailed
-     */
-    public function _download_system_status()
-    {
-        $status_info = EEM_System_Status::instance()->get_system_stati();
-        header('Content-Disposition: attachment');
-        header("Content-Disposition: attachment; filename=system_status_" . sanitize_key(site_url()) . ".html");
-        $output = '<style>table{border:1px solid darkgrey;}td{vertical-align:top}</style>';
-        $output .= '<h1>' . sprintf(
-            __('System Information for %1$s', 'event_espresso'),
-            esc_url_raw(site_url())
-        ) . '</h1>';
-        $output .= EEH_Template::layout_array_as_table($status_info);
-        echo esc_html($output);
-        die;
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    public function _send_migration_crash_report()
-    {
-        $from      = $this->_req_data['from'];
-        $from_name = $this->_req_data['from_name'];
-        $body      = $this->_req_data['body'];
-        try {
-            $success = wp_mail(
-                EE_SUPPORT_EMAIL,
-                'Migration Crash Report',
-                $body . "/r/n<br>" . print_r(EEM_System_Status::instance()->get_system_stati(), true),
-                [
-                    "from:$from_name<$from>",
-                ]
-            );
-        } catch (Exception $e) {
-            $success = false;
-        }
-        $this->_redirect_after_action(
-            $success,
-            esc_html__("Migration Crash Report", "event_espresso"),
-            esc_html__("sent", "event_espresso"),
-            ['success' => $success, 'action' => 'confirm_migration_crash_report_sent']
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    public function _confirm_migration_crash_report_sent()
-    {
-        try {
-            $most_recent_migration = $this->migration_manager->get_last_ran_script(true);
-        } catch (EE_Error $e) {
-            $this->migration_manager->add_error_to_migrations_ran($e->getMessage());
-            // now, just so we can display the page correctly, make an error migration script stage object
-            // and also put the error on it. It only persists for the duration of this request
-            $most_recent_migration = new EE_DMS_Unknown_1_0_0();
-            $most_recent_migration->add_error($e->getMessage());
-        }
-        $success                                       = $this->_req_data['success'] === '1';
-        $this->_template_args['success']               = $success;
-        $this->_template_args['most_recent_migration'] = $most_recent_migration;
-        $this->_template_args['reset_db_action_url']   = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'reset_db'],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['reset_db_page_url']     = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'data_reset'],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['reattempt_action_url']  = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'reattempt_migration'],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_path                          =
-            EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
-        $this->_template_args['admin_page_content']    = EEH_Template::display_template(
-            $this->_template_path,
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Resets the entire EE4 database.
-     * only sets up ee4 database for a fresh install-
-     * doesn't actually clean out the old wp options, or cpts
-     * (although it does erase old ee table data)
-     *
-     * @param boolean $nuke_old_ee4_data controls whether we destroy the old ee4 data,
-     *                                   or just try initializing ee4 default data
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function _reset_db($nuke_old_ee4_data = true)
-    {
-        $this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
-        if ($nuke_old_ee4_data) {
-            EEH_Activation::delete_all_espresso_cpt_data();
-            EEH_Activation::delete_all_espresso_tables_and_data(false);
-            EEH_Activation::remove_cron_tasks();
-        }
-        // make sure when we reset the registry's config that it
-        // switches to using the new singleton
-        EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset(true);
-        EE_System::instance()->initialize_db_if_no_migrations_required(true);
-        EE_System::instance()->redirect_to_about_ee();
-    }
-
-
-    /**
-     * Deletes ALL EE tables, Records, and Options from the database.
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function _delete_db()
-    {
-        $this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
-        EEH_Activation::delete_all_espresso_cpt_data();
-        EEH_Activation::delete_all_espresso_tables_and_data();
-        EEH_Activation::remove_cron_tasks();
-        EEH_Activation::deactivate_event_espresso();
-        wp_safe_redirect(admin_url('plugins.php'));
-        exit;
-    }
-
-
-    /**
-     * sets up EE4 to rerun the migrations from ee3 to ee4
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function _rerun_migration_from_ee3()
-    {
-        $this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
-        EEH_Activation::delete_all_espresso_cpt_data();
-        EEH_Activation::delete_all_espresso_tables_and_data(false);
-        // set the db state to something that will require migrations
-        update_option(EE_Data_Migration_Manager::current_database_state, '3.1.36.0');
-        $this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_2_complete_maintenance);
-        $this->_redirect_after_action(
-            true,
-            esc_html__("Database", 'event_espresso'),
-            esc_html__("reset", 'event_espresso')
-        );
-    }
-
-
-    // none of the below group are currently used for Gateway Settings
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-        wp_enqueue_script('ee_admin_js');
-        wp_enqueue_script(
-            'ee-maintenance',
-            EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.js',
-            ['jquery'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_style(
-            'espresso_maintenance',
-            EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso_maintenance');
-        // localize script stuff
-        wp_localize_script(
-            'ee-maintenance',
-            'ee_maintenance',
-            [
-                'migrating'                        => wp_strip_all_tags(__("Updating Database...", "event_espresso")),
-                'next'                             => wp_strip_all_tags(__("Next", "event_espresso")),
-                'fatal_error'                      => wp_strip_all_tags(__(
-                    "A Fatal Error Has Occurred",
-                    "event_espresso"
-                )),
-                'click_next_when_ready'            => wp_strip_all_tags(
-                    __(
-                        "The current Database Update has ended. Click 'next' when ready to proceed",
-                        "event_espresso"
-                    )
-                ),
-                'status_no_more_migration_scripts' => EE_Data_Migration_Manager::status_no_more_migration_scripts,
-                'status_fatal_error'               => EE_Data_Migration_Manager::status_fatal_error,
-                'status_completed'                 => EE_Data_Migration_Manager::status_completed,
-                'confirm'                          => wp_strip_all_tags(
-                    __(
-                        'Are you sure you want to do this? It CANNOT be undone!',
-                        'event_espresso'
-                    )
-                ),
-                'confirm_skip_migration'           => wp_strip_all_tags(
-                    __(
-                        'You have chosen to NOT migrate your existing data. Are you sure you want to continue?',
-                        'event_espresso'
-                    )
-                ),
-            ]
-        );
-    }
-
-
-    public function load_scripts_styles_default()
-    {
-    }
-
-
-    /**
-     * Enqueue scripts and styles for the datetime tools page.
-     */
-    public function load_scripts_styles_datetime_tools()
-    {
-        EE_Datepicker_Input::enqueue_styles_and_scripts();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _datetime_tools()
-    {
-        $form_action                                = EE_Admin_Page::add_query_args_and_nonce(
-            [
-                'action'        => 'run_datetime_offset_fix',
-                'return_action' => $this->_req_action,
-            ],
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $form                                       = $this->_get_datetime_offset_fix_form();
-        $this->_admin_page_title                    = esc_html__('Datetime Utilities', 'event_espresso');
-        $this->_template_args['admin_page_content'] = $form->form_open($form_action, 'post')
-                                                      . $form->get_html_and_js()
-                                                      . $form->form_close();
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _get_datetime_offset_fix_form()
-    {
-        if (! $this->datetime_fix_offset_form instanceof EE_Form_Section_Proper) {
-            $this->datetime_fix_offset_form = new EE_Form_Section_Proper(
-                [
-                    'name'            => 'datetime_offset_fix_option',
-                    'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                    'subsections'     => [
-                        'title'                  => new EE_Form_Section_HTML(
-                            EEH_HTML::h2(
-                                esc_html__('Datetime Offset Tool', 'event_espresso')
-                            )
-                        ),
-                        'explanation'            => new EE_Form_Section_HTML(
-                            EEH_HTML::p(
-                                esc_html__(
-                                    'Use this tool to automatically apply the provided offset to all Event Espresso records in your database that involve dates and times.',
-                                    'event_espresso'
-                                )
-                            )
-                            . EEH_HTML::p(
-                                esc_html__(
-                                    'Note: If you enter 1.25, that will result in the offset of 1 hour 15 minutes being applied.  Decimals represent the fraction of hours, not minutes.',
-                                    'event_espresso'
-                                )
-                            )
-                        ),
-                        'offset_input'           => new EE_Float_Input(
-                            [
-                                'html_name'       => 'offset_for_datetimes',
-                                'html_label_text' => esc_html__(
-                                    'Offset to apply (in hours):',
-                                    'event_espresso'
-                                ),
-                                'min_value'       => '-12',
-                                'max_value'       => '14',
-                                'step_value'      => '.25',
-                                'default'         => DatetimeOffsetFix::getOffset(),
-                            ]
-                        ),
-                        'date_range_explanation' => new EE_Form_Section_HTML(
-                            EEH_HTML::p(
-                                esc_html__(
-                                    'Leave the following fields blank if you want the offset to be applied to all dates. If however, you want to just apply the offset to a specific range of dates you can restrict the offset application using these fields.',
-                                    'event_espresso'
-                                )
-                            )
-                            . EEH_HTML::p(
-                                EEH_HTML::strong(
-                                    sprintf(
-                                        esc_html__(
-                                            'Note: please enter the dates in UTC (You can use %1$sthis online tool%2$s to assist with conversions).',
-                                            'event_espresso'
-                                        ),
-                                        '<a href="https://www.timeanddate.com/worldclock/converter.html">',
-                                        '</a>'
-                                    )
-                                )
-                            )
-                        ),
-                        'date_range_start_date'  => new EE_Datepicker_Input(
-                            [
-                                'html_name'       => 'offset_date_start_range',
-                                'html_label_text' => esc_html__(
-                                    'Start Date for dates the offset applied to:',
-                                    'event_espresso'
-                                ),
-                            ]
-                        ),
-                        'date_range_end_date'    => new EE_Datepicker_Input(
-                            [
-                                'html_name'       => 'offset_date_end_range',
-                                'html_label_text' => esc_html__(
-                                    'End Date for dates the offset is applied to:',
-                                    'event_espresso'
-                                ),
-                            ]
-                        ),
-                        'submit'                 => new EE_Submit_Input(
-                            [
-                                'html_label_text' => '',
-                                'default'         => esc_html__('Apply Offset', 'event_espresso'),
-                            ]
-                        ),
-                    ],
-                ]
-            );
-        }
-        return $this->datetime_fix_offset_form;
-    }
-
-
-    /**
-     * Callback for the run_datetime_offset_fix route.
-     *
-     * @throws EE_Error
-     */
-    protected function _apply_datetime_offset()
-    {
-        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-            $form = $this->_get_datetime_offset_fix_form();
-            $form->receive_form_submission($this->_req_data);
-            if ($form->is_valid()) {
-                // save offset data so batch processor can get it.
-                DatetimeOffsetFix::updateOffset($form->get_input_value('offset_input'));
-                $utc_timezone          = new DateTimeZone('UTC');
-                $date_range_start_date = DateTime::createFromFormat(
-                    'm/d/Y H:i:s',
-                    $form->get_input_value('date_range_start_date') . ' 00:00:00',
-                    $utc_timezone
-                );
-                $date_range_end_date   = DateTime::createFromFormat(
-                    'm/d/Y H:i:s',
-                    $form->get_input_value('date_range_end_date') . ' 23:59:59',
-                    $utc_timezone
-                );
-                if ($date_range_start_date instanceof DateTime) {
-                    DatetimeOffsetFix::updateStartDateRange(DbSafeDateTime::createFromDateTime($date_range_start_date));
-                }
-                if ($date_range_end_date instanceof DateTime) {
-                    DatetimeOffsetFix::updateEndDateRange(DbSafeDateTime::createFromDateTime($date_range_end_date));
-                }
-                // redirect to batch tool
-                wp_redirect(
-                    EE_Admin_Page::add_query_args_and_nonce(
-                        [
-                            'page'        => EED_Batch::PAGE_SLUG,
-                            'batch'       => EED_Batch::batch_job,
-                            'label'       => esc_html__('Applying Offset', 'event_espresso'),
-                            'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\DatetimeOffsetFix'),
-                            'return_url'  => urlencode(
-                                add_query_arg(
-                                    [
-                                        'action' => 'datetime_tools',
-                                    ],
-                                    EEH_URL::current_url_without_query_paramaters(
-                                        [
-                                            'return_action',
-                                            'run_datetime_offset_fix_nonce',
-                                            'return',
-                                            'datetime_tools_nonce',
-                                        ]
-                                    )
-                                )
-                            ),
-                        ],
-                        admin_url()
-                    )
-                );
-                exit;
-            }
-        }
-    }
+	/**
+	 * @var EE_Data_Migration_Manager
+	 */
+	protected $migration_manager;
+
+	/**
+	 * @var EE_Maintenance_Mode
+	 */
+	protected $maintenance_mode;
+
+	/**
+	 * @var EE_Form_Section_Proper
+	 */
+	protected $datetime_fix_offset_form;
+
+
+	/**
+	 * @param bool $routing
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct($routing = true)
+	{
+		$this->migration_manager = EE_Data_Migration_Manager::instance();
+		$this->maintenance_mode  = EE_Maintenance_Mode::instance();
+		parent::__construct($routing);
+	}
+
+
+	protected function _init_page_props()
+	{
+		$this->page_slug        = EE_MAINTENANCE_PG_SLUG;
+		$this->page_label       = EE_MAINTENANCE_LABEL;
+		$this->_admin_base_url  = EE_MAINTENANCE_ADMIN_URL;
+		$this->_admin_base_path = EE_MAINTENANCE_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_migration_step', [$this, 'migration_step']);
+		add_action('wp_ajax_add_error_to_migrations_ran', [$this, 'add_error_to_migrations_ran']);
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = EE_MAINTENANCE_LABEL;
+		$this->_labels           = [
+			'buttons' => [
+				'reset_reservations' => esc_html__('Reset Ticket and Datetime Reserved Counts', 'event_espresso'),
+				'reset_capabilities' => esc_html__('Reset Event Espresso Capabilities', 'event_espresso'),
+			],
+		];
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = [
+			'default'                             => [
+				'func'       => '_maintenance',
+				'capability' => 'manage_options',
+			],
+			'change_maintenance_level'            => [
+				'func'       => '_change_maintenance_level',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'system_status'                       => [
+				'func'       => '_system_status',
+				'capability' => 'manage_options',
+			],
+			'download_system_status'              => [
+				'func'       => '_download_system_status',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'send_migration_crash_report'         => [
+				'func'       => '_send_migration_crash_report',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'confirm_migration_crash_report_sent' => [
+				'func'       => '_confirm_migration_crash_report_sent',
+				'capability' => 'manage_options',
+			],
+			'data_reset'                          => [
+				'func'       => '_data_reset_and_delete',
+				'capability' => 'manage_options',
+			],
+			'reset_db'                            => [
+				'func'       => '_reset_db',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+				'args'       => ['nuke_old_ee4_data' => true],
+			],
+			'start_with_fresh_ee4_db'             => [
+				'func'       => '_reset_db',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+				'args'       => ['nuke_old_ee4_data' => false],
+			],
+			'delete_db'                           => [
+				'func'       => '_delete_db',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'rerun_migration_from_ee3'            => [
+				'func'       => '_rerun_migration_from_ee3',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'reset_reservations'                  => [
+				'func'       => '_reset_reservations',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'reset_capabilities'                  => [
+				'func'       => '_reset_capabilities',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'reattempt_migration'                 => [
+				'func'       => '_reattempt_migration',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'datetime_tools'                      => [
+				'func'       => '_datetime_tools',
+				'capability' => 'manage_options',
+			],
+			'run_datetime_offset_fix'             => [
+				'func'               => '_apply_datetime_offset',
+				'noheader'           => true,
+				'headers_sent_route' => 'datetime_tools',
+				'capability'         => 'manage_options',
+			],
+		];
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = [
+			'default'        => [
+				'nav'           => [
+					'label' => esc_html__('Maintenance', 'event_espresso'),
+					'icon' => 'dashicons-admin-tools',
+					'order' => 10,
+				],
+				'require_nonce' => false,
+			],
+			'data_reset'     => [
+				'nav'           => [
+					'label' => esc_html__('Reset/Delete Data', 'event_espresso'),
+					'icon' => 'dashicons-trash',
+					'order' => 20,
+				],
+				'require_nonce' => false,
+			],
+			'datetime_tools' => [
+				'nav'           => [
+					'label' => esc_html__('Datetime Utilities', 'event_espresso'),
+					'icon' => 'dashicons-calendar-alt',
+					'order' => 25,
+				],
+				'require_nonce' => false,
+			],
+			'system_status'  => [
+				'nav'           => [
+					'label' => esc_html__("System Information", "event_espresso"),
+					'icon' => 'dashicons-info',
+					'order' => 30,
+				],
+				'require_nonce' => false,
+			],
+		];
+	}
+
+
+	/**
+	 * default maintenance page.
+	 * If we're in maintenance mode level 2, then we need to show the migration scripts and all that UI.
+	 *
+	 * @throws EE_Error
+	 */
+	public function _maintenance()
+	{
+		$show_maintenance_switch         = true;
+		$show_backup_db_text             = false;
+		$show_migration_progress         = false;
+		$script_names                    = [];
+		$addons_should_be_upgraded_first = false;
+		// it all depends on if we're in maintenance model level 1 (frontend-only) or
+		// level 2 (everything except maintenance page)
+		try {
+			// get the current maintenance level and check if
+			// we are removed
+			$mMode_level  = $this->maintenance_mode->level();
+			$placed_in_mm = $this->maintenance_mode->set_maintenance_mode_if_db_old();
+			if ($mMode_level == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm) {
+				// we just took the site out of maintenance mode, so notify the user.
+				// unfortunately this message appears to be echoed on the NEXT page load...
+				// oh well, we should really be checking for this on addon deactivation anyways
+				EE_Error::add_attention(
+					esc_html__(
+						'Site taken out of maintenance mode because no data migration scripts are required',
+						'event_espresso'
+					)
+				);
+				$this->_process_notices(['page' => 'espresso_maintenance_settings']);
+			}
+			// in case an exception is thrown while trying to handle migrations
+			if ($mMode_level === EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$show_maintenance_switch = false;
+				$show_migration_progress = true;
+				if (isset($this->_req_data['continue_migration'])) {
+					$show_backup_db_text = false;
+				} else {
+					$show_backup_db_text = true;
+				}
+				$scripts_needing_to_run          =
+					$this->migration_manager->check_for_applicable_data_migration_scripts();
+				$addons_should_be_upgraded_first = $this->migration_manager->addons_need_updating();
+				$script_names                    = [];
+				$current_script                  = null;
+				foreach ($scripts_needing_to_run as $script) {
+					if ($script instanceof EE_Data_Migration_Script_Base) {
+						if (! $current_script) {
+							$current_script = $script;
+							$current_script->migration_page_hooks();
+						}
+						$script_names[] = $script->pretty_name();
+					}
+				}
+			}
+			$most_recent_migration = $this->migration_manager->get_last_ran_script(true);
+			$exception_thrown      = false;
+		} catch (EE_Error $e) {
+			$this->migration_manager->add_error_to_migrations_ran($e->getMessage());
+			// now, just so we can display the page correctly, make an error migration script stage object
+			// and also put the error on it. It only persists for the duration of this request
+			$most_recent_migration = new EE_DMS_Unknown_1_0_0();
+			$most_recent_migration->add_error($e->getMessage());
+			$exception_thrown = true;
+		}
+		$current_db_state = $this->migration_manager->ensure_current_database_state_is_set();
+		$current_db_state = str_replace('.decaf', '', $current_db_state);
+		if (
+			$exception_thrown
+			|| (
+				$most_recent_migration instanceof EE_Data_Migration_Script_Base
+				&& $most_recent_migration->is_broken()
+			)
+		) {
+			$this->_template_path                =
+				EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
+			$this->_template_args['support_url'] = 'https://eventespresso.com/support/forums/';
+			$this->_template_args['next_url']    = EEH_URL::add_query_args_and_nonce(
+				[
+					'action'  => 'confirm_migration_crash_report_sent',
+					'success' => '0',
+				],
+				EE_MAINTENANCE_ADMIN_URL
+			);
+		} elseif ($addons_should_be_upgraded_first) {
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
+		} else {
+			if (
+				$most_recent_migration instanceof EE_Data_Migration_Script_Base
+				&& $most_recent_migration->can_continue()
+			) {
+				$show_backup_db_text                    = false;
+				$show_continue_current_migration_script = true;
+				$show_most_recent_migration             = true;
+			} elseif (isset($this->_req_data['continue_migration'])) {
+				$show_most_recent_migration             = true;
+				$show_continue_current_migration_script = false;
+			} else {
+				$show_most_recent_migration             = false;
+				$show_continue_current_migration_script = false;
+			}
+			if (isset($current_script)) {
+				$migrates_to          = $current_script->migrates_to_version();
+				$plugin_slug          = $migrates_to['slug'];
+				$new_version          = $migrates_to['version'];
+				$this->_template_args = array_merge(
+					$this->_template_args,
+					[
+						'current_db_state' => sprintf(
+							esc_html__("EE%s (%s)", "event_espresso"),
+							isset($current_db_state[ $plugin_slug ]) ? $current_db_state[ $plugin_slug ] : 3,
+							$plugin_slug
+						),
+						'next_db_state'    => sprintf(
+							esc_html__("EE%s (%s)", 'event_espresso'),
+							$new_version,
+							$plugin_slug
+						),
+					]
+				);
+			} else {
+				$this->_template_args['current_db_state'] = null;
+				$this->_template_args['next_db_state']    = null;
+			}
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
+			$this->_template_args = array_merge(
+				$this->_template_args,
+				[
+					'show_most_recent_migration'             => $show_most_recent_migration,
+					// flag for showing the most recent migration's status and/or errors
+					'show_migration_progress'                => $show_migration_progress,
+					// flag for showing the option to run migrations and see their progress
+					'show_backup_db_text'                    => $show_backup_db_text,
+					// flag for showing text telling the user to back up their DB
+					'show_maintenance_switch'                => $show_maintenance_switch,
+					// flag for showing the option to change maintenance mode between levels 0 and 1
+					'script_names'                           => $script_names,
+					// array of names of scripts that have run
+					'show_continue_current_migration_script' => $show_continue_current_migration_script,
+					// flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
+					'reset_db_page_link'                     => EE_Admin_Page::add_query_args_and_nonce(
+						['action' => 'reset_db'],
+						EE_MAINTENANCE_ADMIN_URL
+					),
+					'data_reset_page'                        => EE_Admin_Page::add_query_args_and_nonce(
+						['action' => 'data_reset'],
+						EE_MAINTENANCE_ADMIN_URL
+					),
+					'update_migration_script_page_link'      => EE_Admin_Page::add_query_args_and_nonce(
+						['action' => 'change_maintenance_level'],
+						EE_MAINTENANCE_ADMIN_URL
+					),
+					'ultimate_db_state'                      => sprintf(
+						esc_html__("EE%s", 'event_espresso'),
+						espresso_version()
+					),
+				]
+			);
+		}
+		$this->_template_args['most_recent_migration'] =
+			$most_recent_migration;// the actual most recently ran migration
+		// now render the migration options part, and put it in a variable
+		$migration_options_template_file                = apply_filters(
+			'FHEE__ee_migration_page__migration_options_template',
+			EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee4.template.php'
+		);
+		$migration_options_html                         = EEH_Template::display_template(
+			$migration_options_template_file,
+			$this->_template_args,
+			true
+		);
+		$this->_template_args['migration_options_html'] = $migration_options_html;
+		$this->_template_args['admin_page_content']     = EEH_Template::display_template(
+			$this->_template_path,
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * returns JSON and executes another step of the currently-executing data migration (called via ajax)
+	 *
+	 * @throws EE_Error
+	 */
+	public function migration_step()
+	{
+		$this->_template_args['data'] = $this->migration_manager->response_to_migration_ajax_request();
+		$this->_return_json();
+	}
+
+
+	/**
+	 * Can be used by js when it notices a response with HTML in it in order
+	 * to log the malformed response
+	 *
+	 * @throws EE_Error
+	 */
+	public function add_error_to_migrations_ran()
+	{
+		$this->migration_manager->add_error_to_migrations_ran($this->_req_data['message']);
+		$this->_template_args['data'] = ['ok' => true];
+		$this->_return_json();
+	}
+
+
+	/**
+	 * changes the maintenance level, provided there are still no migration scripts that should run
+	 *
+	 * @throws EE_Error
+	 */
+	public function _change_maintenance_level()
+	{
+		$new_level = absint($this->_req_data['maintenance_mode_level']);
+		if (! $this->migration_manager->check_for_applicable_data_migration_scripts()) {
+			$this->maintenance_mode->set_maintenance_level($new_level);
+			$success = true;
+		} else {
+			$this->maintenance_mode->set_maintenance_mode_if_db_old();
+			$success = false;
+		}
+		$this->_redirect_after_action($success, 'Maintenance Mode', esc_html__("Updated", "event_espresso"));
+	}
+
+
+	/**
+	 * a tab with options for resetting and/or deleting EE data
+	 *
+	 * @throws EE_Error
+	 * @throws DomainException
+	 */
+	public function _data_reset_and_delete()
+	{
+		$this->_template_path                              =
+			EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
+		$this->_template_args['reset_reservations_button'] = $this->get_action_link_or_button(
+			'reset_reservations',
+			'reset_reservations',
+			[],
+			'button button--caution ee-confirm'
+		);
+		$this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button(
+			'reset_capabilities',
+			'reset_capabilities',
+			[],
+			'button button--caution ee-confirm'
+		);
+		$this->_template_args['delete_db_url']             = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'delete_db'],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['reset_db_url']              = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'reset_db'],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['admin_page_content']        = EEH_Template::display_template(
+			$this->_template_path,
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _reset_reservations()
+	{
+		if (EED_Ticket_Sales_Monitor::reset_reservation_counts()) {
+			EE_Error::add_success(
+				esc_html__(
+					'Ticket and datetime reserved counts have been successfully reset.',
+					'event_espresso'
+				)
+			);
+		} else {
+			EE_Error::add_success(
+				esc_html__(
+					'Ticket and datetime reserved counts were correct and did not need resetting.',
+					'event_espresso'
+				)
+			);
+		}
+		$this->_redirect_after_action(true, '', '', ['action' => 'data_reset'], true);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _reset_capabilities()
+	{
+		EE_Registry::instance()->CAP->init_caps(true);
+		EE_Error::add_success(
+			esc_html__(
+				'Default Event Espresso capabilities have been restored for all current roles.',
+				'event_espresso'
+			)
+		);
+		$this->_redirect_after_action(false, '', '', ['action' => 'data_reset'], true);
+	}
+
+
+	/**
+	 * resets the DMSs, so we can attempt to continue migrating after a fatal error
+	 * (only a good idea when someone has somehow tried ot fix whatever caused
+	 * the fatal error in teh first place)
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _reattempt_migration()
+	{
+		$this->migration_manager->reattempt();
+		$this->_redirect_after_action(false, '', '', ['action' => 'default'], true);
+	}
+
+
+	/**
+	 * shows the big ol' System Information page
+	 *
+	 * @throws EE_Error
+	 */
+	public function _system_status()
+	{
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
+		$this->_template_args['system_stati']               = EEM_System_Status::instance()->get_system_stati();
+		$this->_template_args['download_system_status_url'] = EE_Admin_Page::add_query_args_and_nonce(
+			[
+				'action' => 'download_system_status',
+			],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['admin_page_content']         = EEH_Template::display_template(
+			$this->_template_path,
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * Downloads an HTML file of the system status that can be easily stored or emailed
+	 */
+	public function _download_system_status()
+	{
+		$status_info = EEM_System_Status::instance()->get_system_stati();
+		header('Content-Disposition: attachment');
+		header("Content-Disposition: attachment; filename=system_status_" . sanitize_key(site_url()) . ".html");
+		$output = '<style>table{border:1px solid darkgrey;}td{vertical-align:top}</style>';
+		$output .= '<h1>' . sprintf(
+			__('System Information for %1$s', 'event_espresso'),
+			esc_url_raw(site_url())
+		) . '</h1>';
+		$output .= EEH_Template::layout_array_as_table($status_info);
+		echo esc_html($output);
+		die;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	public function _send_migration_crash_report()
+	{
+		$from      = $this->_req_data['from'];
+		$from_name = $this->_req_data['from_name'];
+		$body      = $this->_req_data['body'];
+		try {
+			$success = wp_mail(
+				EE_SUPPORT_EMAIL,
+				'Migration Crash Report',
+				$body . "/r/n<br>" . print_r(EEM_System_Status::instance()->get_system_stati(), true),
+				[
+					"from:$from_name<$from>",
+				]
+			);
+		} catch (Exception $e) {
+			$success = false;
+		}
+		$this->_redirect_after_action(
+			$success,
+			esc_html__("Migration Crash Report", "event_espresso"),
+			esc_html__("sent", "event_espresso"),
+			['success' => $success, 'action' => 'confirm_migration_crash_report_sent']
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	public function _confirm_migration_crash_report_sent()
+	{
+		try {
+			$most_recent_migration = $this->migration_manager->get_last_ran_script(true);
+		} catch (EE_Error $e) {
+			$this->migration_manager->add_error_to_migrations_ran($e->getMessage());
+			// now, just so we can display the page correctly, make an error migration script stage object
+			// and also put the error on it. It only persists for the duration of this request
+			$most_recent_migration = new EE_DMS_Unknown_1_0_0();
+			$most_recent_migration->add_error($e->getMessage());
+		}
+		$success                                       = $this->_req_data['success'] === '1';
+		$this->_template_args['success']               = $success;
+		$this->_template_args['most_recent_migration'] = $most_recent_migration;
+		$this->_template_args['reset_db_action_url']   = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'reset_db'],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['reset_db_page_url']     = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'data_reset'],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['reattempt_action_url']  = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'reattempt_migration'],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_path                          =
+			EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
+		$this->_template_args['admin_page_content']    = EEH_Template::display_template(
+			$this->_template_path,
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Resets the entire EE4 database.
+	 * only sets up ee4 database for a fresh install-
+	 * doesn't actually clean out the old wp options, or cpts
+	 * (although it does erase old ee table data)
+	 *
+	 * @param boolean $nuke_old_ee4_data controls whether we destroy the old ee4 data,
+	 *                                   or just try initializing ee4 default data
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function _reset_db($nuke_old_ee4_data = true)
+	{
+		$this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
+		if ($nuke_old_ee4_data) {
+			EEH_Activation::delete_all_espresso_cpt_data();
+			EEH_Activation::delete_all_espresso_tables_and_data(false);
+			EEH_Activation::remove_cron_tasks();
+		}
+		// make sure when we reset the registry's config that it
+		// switches to using the new singleton
+		EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset(true);
+		EE_System::instance()->initialize_db_if_no_migrations_required(true);
+		EE_System::instance()->redirect_to_about_ee();
+	}
+
+
+	/**
+	 * Deletes ALL EE tables, Records, and Options from the database.
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function _delete_db()
+	{
+		$this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
+		EEH_Activation::delete_all_espresso_cpt_data();
+		EEH_Activation::delete_all_espresso_tables_and_data();
+		EEH_Activation::remove_cron_tasks();
+		EEH_Activation::deactivate_event_espresso();
+		wp_safe_redirect(admin_url('plugins.php'));
+		exit;
+	}
+
+
+	/**
+	 * sets up EE4 to rerun the migrations from ee3 to ee4
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function _rerun_migration_from_ee3()
+	{
+		$this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
+		EEH_Activation::delete_all_espresso_cpt_data();
+		EEH_Activation::delete_all_espresso_tables_and_data(false);
+		// set the db state to something that will require migrations
+		update_option(EE_Data_Migration_Manager::current_database_state, '3.1.36.0');
+		$this->maintenance_mode->set_maintenance_level(EE_Maintenance_Mode::level_2_complete_maintenance);
+		$this->_redirect_after_action(
+			true,
+			esc_html__("Database", 'event_espresso'),
+			esc_html__("reset", 'event_espresso')
+		);
+	}
+
+
+	// none of the below group are currently used for Gateway Settings
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script(
+			'ee-maintenance',
+			EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.js',
+			['jquery'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style(
+			'espresso_maintenance',
+			EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso_maintenance');
+		// localize script stuff
+		wp_localize_script(
+			'ee-maintenance',
+			'ee_maintenance',
+			[
+				'migrating'                        => wp_strip_all_tags(__("Updating Database...", "event_espresso")),
+				'next'                             => wp_strip_all_tags(__("Next", "event_espresso")),
+				'fatal_error'                      => wp_strip_all_tags(__(
+					"A Fatal Error Has Occurred",
+					"event_espresso"
+				)),
+				'click_next_when_ready'            => wp_strip_all_tags(
+					__(
+						"The current Database Update has ended. Click 'next' when ready to proceed",
+						"event_espresso"
+					)
+				),
+				'status_no_more_migration_scripts' => EE_Data_Migration_Manager::status_no_more_migration_scripts,
+				'status_fatal_error'               => EE_Data_Migration_Manager::status_fatal_error,
+				'status_completed'                 => EE_Data_Migration_Manager::status_completed,
+				'confirm'                          => wp_strip_all_tags(
+					__(
+						'Are you sure you want to do this? It CANNOT be undone!',
+						'event_espresso'
+					)
+				),
+				'confirm_skip_migration'           => wp_strip_all_tags(
+					__(
+						'You have chosen to NOT migrate your existing data. Are you sure you want to continue?',
+						'event_espresso'
+					)
+				),
+			]
+		);
+	}
+
+
+	public function load_scripts_styles_default()
+	{
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the datetime tools page.
+	 */
+	public function load_scripts_styles_datetime_tools()
+	{
+		EE_Datepicker_Input::enqueue_styles_and_scripts();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _datetime_tools()
+	{
+		$form_action                                = EE_Admin_Page::add_query_args_and_nonce(
+			[
+				'action'        => 'run_datetime_offset_fix',
+				'return_action' => $this->_req_action,
+			],
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$form                                       = $this->_get_datetime_offset_fix_form();
+		$this->_admin_page_title                    = esc_html__('Datetime Utilities', 'event_espresso');
+		$this->_template_args['admin_page_content'] = $form->form_open($form_action, 'post')
+													  . $form->get_html_and_js()
+													  . $form->form_close();
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _get_datetime_offset_fix_form()
+	{
+		if (! $this->datetime_fix_offset_form instanceof EE_Form_Section_Proper) {
+			$this->datetime_fix_offset_form = new EE_Form_Section_Proper(
+				[
+					'name'            => 'datetime_offset_fix_option',
+					'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+					'subsections'     => [
+						'title'                  => new EE_Form_Section_HTML(
+							EEH_HTML::h2(
+								esc_html__('Datetime Offset Tool', 'event_espresso')
+							)
+						),
+						'explanation'            => new EE_Form_Section_HTML(
+							EEH_HTML::p(
+								esc_html__(
+									'Use this tool to automatically apply the provided offset to all Event Espresso records in your database that involve dates and times.',
+									'event_espresso'
+								)
+							)
+							. EEH_HTML::p(
+								esc_html__(
+									'Note: If you enter 1.25, that will result in the offset of 1 hour 15 minutes being applied.  Decimals represent the fraction of hours, not minutes.',
+									'event_espresso'
+								)
+							)
+						),
+						'offset_input'           => new EE_Float_Input(
+							[
+								'html_name'       => 'offset_for_datetimes',
+								'html_label_text' => esc_html__(
+									'Offset to apply (in hours):',
+									'event_espresso'
+								),
+								'min_value'       => '-12',
+								'max_value'       => '14',
+								'step_value'      => '.25',
+								'default'         => DatetimeOffsetFix::getOffset(),
+							]
+						),
+						'date_range_explanation' => new EE_Form_Section_HTML(
+							EEH_HTML::p(
+								esc_html__(
+									'Leave the following fields blank if you want the offset to be applied to all dates. If however, you want to just apply the offset to a specific range of dates you can restrict the offset application using these fields.',
+									'event_espresso'
+								)
+							)
+							. EEH_HTML::p(
+								EEH_HTML::strong(
+									sprintf(
+										esc_html__(
+											'Note: please enter the dates in UTC (You can use %1$sthis online tool%2$s to assist with conversions).',
+											'event_espresso'
+										),
+										'<a href="https://www.timeanddate.com/worldclock/converter.html">',
+										'</a>'
+									)
+								)
+							)
+						),
+						'date_range_start_date'  => new EE_Datepicker_Input(
+							[
+								'html_name'       => 'offset_date_start_range',
+								'html_label_text' => esc_html__(
+									'Start Date for dates the offset applied to:',
+									'event_espresso'
+								),
+							]
+						),
+						'date_range_end_date'    => new EE_Datepicker_Input(
+							[
+								'html_name'       => 'offset_date_end_range',
+								'html_label_text' => esc_html__(
+									'End Date for dates the offset is applied to:',
+									'event_espresso'
+								),
+							]
+						),
+						'submit'                 => new EE_Submit_Input(
+							[
+								'html_label_text' => '',
+								'default'         => esc_html__('Apply Offset', 'event_espresso'),
+							]
+						),
+					],
+				]
+			);
+		}
+		return $this->datetime_fix_offset_form;
+	}
+
+
+	/**
+	 * Callback for the run_datetime_offset_fix route.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _apply_datetime_offset()
+	{
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			$form = $this->_get_datetime_offset_fix_form();
+			$form->receive_form_submission($this->_req_data);
+			if ($form->is_valid()) {
+				// save offset data so batch processor can get it.
+				DatetimeOffsetFix::updateOffset($form->get_input_value('offset_input'));
+				$utc_timezone          = new DateTimeZone('UTC');
+				$date_range_start_date = DateTime::createFromFormat(
+					'm/d/Y H:i:s',
+					$form->get_input_value('date_range_start_date') . ' 00:00:00',
+					$utc_timezone
+				);
+				$date_range_end_date   = DateTime::createFromFormat(
+					'm/d/Y H:i:s',
+					$form->get_input_value('date_range_end_date') . ' 23:59:59',
+					$utc_timezone
+				);
+				if ($date_range_start_date instanceof DateTime) {
+					DatetimeOffsetFix::updateStartDateRange(DbSafeDateTime::createFromDateTime($date_range_start_date));
+				}
+				if ($date_range_end_date instanceof DateTime) {
+					DatetimeOffsetFix::updateEndDateRange(DbSafeDateTime::createFromDateTime($date_range_end_date));
+				}
+				// redirect to batch tool
+				wp_redirect(
+					EE_Admin_Page::add_query_args_and_nonce(
+						[
+							'page'        => EED_Batch::PAGE_SLUG,
+							'batch'       => EED_Batch::batch_job,
+							'label'       => esc_html__('Applying Offset', 'event_espresso'),
+							'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\DatetimeOffsetFix'),
+							'return_url'  => urlencode(
+								add_query_arg(
+									[
+										'action' => 'datetime_tools',
+									],
+									EEH_URL::current_url_without_query_paramaters(
+										[
+											'return_action',
+											'run_datetime_offset_fix_nonce',
+											'return',
+											'datetime_tools_nonce',
+										]
+									)
+								)
+							),
+						],
+						admin_url()
+					)
+				);
+				exit;
+			}
+		}
+	}
 }

admin_pages/venues/Venues_Admin_Page.core.php

Indentation +1563 added lines, -1563 removed lines

@@ -13,1573 +13,1573 @@
  */
 class Venues_Admin_Page extends EE_Admin_Page_CPT
 {
-    /**
-     * _venue
-     * This will hold the venue object for venue_details screen.
-     *
-     * @access protected
-     * @var object
-     */
-    protected $_venue;
-
-
-    /**
-     * This will hold the category object for category_details screen.
-     *
-     * @var object
-     */
-    protected $_category;
-
-
-    /**
-     * This property will hold the venue model instance
-     *
-     * @var object
-     */
-    protected $_venue_model;
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _init_page_props()
-    {
-        require_once(EE_MODELS . 'EEM_Venue.model.php');
-        $this->page_slug        = EE_VENUES_PG_SLUG;
-        $this->_admin_base_url  = EE_VENUES_ADMIN_URL;
-        $this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
-        $this->page_label       = esc_html__('Event Venues', 'event_espresso');
-        $this->_cpt_model_names = [
-            'create_new' => 'EEM_Venue',
-            'edit'       => 'EEM_Venue',
-        ];
-        $this->_cpt_edit_routes = [
-            'espresso_venues' => 'edit',
-        ];
-        $this->_venue_model     = EEM_Venue::instance();
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ee_venues ajax goes in here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = $this->page_label;
-        $this->_labels           = [
-            'buttons'      => [
-                'add'             => esc_html__('Add New Venue', 'event_espresso'),
-                'edit'            => esc_html__('Edit Venue', 'event_espresso'),
-                'delete'          => esc_html__('Delete Venue', 'event_espresso'),
-                'add_category'    => esc_html__('Add New Category', 'event_espresso'),
-                'edit_category'   => esc_html__('Edit Category', 'event_espresso'),
-                'delete_category' => esc_html__('Delete Category', 'event_espresso'),
-            ],
-            'editor_title' => [
-                'espresso_venues' => esc_html__('Enter Venue name here', 'event_espresso'),
-            ],
-            'publishbox'   => [
-                'create_new'          => esc_html__('Save New Venue', 'event_espresso'),
-                'edit'                => esc_html__('Update Venue', 'event_espresso'),
-                'add_category'        => esc_html__('Save New Category', 'event_espresso'),
-                'edit_category'       => esc_html__('Update Category', 'event_espresso'),
-                'google_map_settings' => esc_html__('Update Settings', 'event_espresso'),
-            ],
-        ];
-    }
-
-
-    protected function _set_page_routes()
-    {
-
-        // load formatter helper
-        // load field generator helper
-
-        // is there a vnu_id in the request?
-        $VNU_ID = $this->request->getRequestParam('VNU_ID', 0, 'int');
-        $VNU_ID = $this->request->getRequestParam('post', $VNU_ID, 'int');
-
-        $this->_page_routes = [
-            'default'                    => [
-                'func'       => '_overview_list_table',
-                'capability' => 'ee_read_venues',
-            ],
-            'create_new'                 => [
-                'func'       => '_create_new_cpt_item',
-                'capability' => 'ee_edit_venues',
-            ],
-            'edit'                       => [
-                'func'       => '_edit_cpt_item',
-                'capability' => 'ee_edit_venue',
-                'obj_id'     => $VNU_ID,
-            ],
-            'trash_venue'                => [
-                'func'       => '_trash_or_restore_venue',
-                'args'       => ['venue_status' => 'trash'],
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue',
-                'obj_id'     => $VNU_ID,
-            ],
-            'trash_venues'               => [
-                'func'       => '_trash_or_restore_venues',
-                'args'       => ['venue_status' => 'trash'],
-                'noheader'   => true,
-                'capability' => 'ee_delete_venues',
-            ],
-            'restore_venue'              => [
-                'func'       => '_trash_or_restore_venue',
-                'args'       => ['venue_status' => 'draft'],
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue',
-                'obj_id'     => $VNU_ID,
-            ],
-            'restore_venues'             => [
-                'func'       => '_trash_or_restore_venues',
-                'args'       => ['venue_status' => 'draft'],
-                'noheader'   => true,
-                'capability' => 'ee_delete_venues',
-            ],
-            'delete_venues'              => [
-                'func'       => '_delete_venues',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venues',
-            ],
-            'delete_venue'               => [
-                'func'       => '_delete_venue',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue',
-                'obj_id'     => $VNU_ID,
-            ],
-            // settings related
-            'google_map_settings'        => [
-                'func'       => '_google_map_settings',
-                'capability' => 'manage_options',
-            ],
-            'update_google_map_settings' => [
-                'func'       => '_update_google_map_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            // venue category tab related
-            'add_category'               => [
-                'func'       => '_category_details',
-                'args'       => ['add'],
-                'capability' => 'ee_edit_venue_category',
-            ],
-            'edit_category'              => [
-                'func'       => '_category_details',
-                'args'       => ['edit'],
-                'capability' => 'ee_edit_venue_category',
-            ],
-            'delete_categories'          => [
-                'func'       => '_delete_categories',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue_category',
-            ],
-
-            'delete_category' => [
-                'func'       => '_delete_categories',
-                'noheader'   => true,
-                'capability' => 'ee_delete_venue_category',
-            ],
-
-            'insert_category' => [
-                'func'       => '_insert_or_update_category',
-                'args'       => ['new_category' => true],
-                'noheader'   => true,
-                'capability' => 'ee_edit_venue_category',
-            ],
-
-            'update_category'   => [
-                'func'       => '_insert_or_update_category',
-                'args'       => ['new_category' => false],
-                'noheader'   => true,
-                'capability' => 'ee_edit_venue_category',
-            ],
-            'export_categories' => [
-                'func'       => '_categories_export',
-                'noheader'   => true,
-                'capability' => 'export',
-            ],
-            'import_categories' => [
-                'func'       => '_import_categories',
-                'capability' => 'import',
-            ],
-            'category_list'     => [
-                'func'       => '_category_list_table',
-                'capability' => 'ee_manage_venue_categories',
-            ],
-        ];
-    }
-
-
-    protected function _set_page_config()
-    {
-        $VNU_ID     = $this->request->getRequestParam('post', 0, 'int');
-        $EVT_CAT_ID = $this->request->getRequestParam('EVT_CAT_ID', 0, 'int');
-
-        $this->_page_config = [
-            'default'             => [
-                'nav'           => [
-                    'label' => esc_html__('Overview', 'event_espresso'),
-                    'icon' => 'dashicons-list-view',
-                    'order' => 10,
-                ],
-                'list_table'    => 'Venues_Admin_List_Table',
-                'help_tabs'     => [
-                    'venues_overview_help_tab'                           => [
-                        'title'    => esc_html__('Venues Overview', 'event_espresso'),
-                        'filename' => 'venues_overview',
-                    ],
-                    'venues_overview_table_column_headings_help_tab'     => [
-                        'title'    => esc_html__('Venues Overview Table Column Headings', 'event_espresso'),
-                        'filename' => 'venues_overview_table_column_headings',
-                    ],
-                    'venues_overview_views_bulk_actions_search_help_tab' => [
-                        'title'    => esc_html__('Venues Overview Views & Bulk Actions & Search', 'event_espresso'),
-                        'filename' => 'venues_overview_views_bulk_actions_search',
-                    ],
-                ],
-                'metaboxes'     => ['_espresso_news_post_box', '_espresso_links_post_box'],
-                'require_nonce' => false,
-            ],
-            'create_new'          => [
-                'nav'           => [
-                    'label'      => esc_html__('Add Venue', 'event_espresso'),
-                    'icon' => 'dashicons-plus-alt',
-                    'order'      => 15,
-                    'persistent' => false,
-                ],
-                'help_tabs'     => [
-                    'venues_editor_help_tab'                                               => [
-                        'title'    => esc_html__('Venue Editor', 'event_espresso'),
-                        'filename' => 'venues_editor',
-                    ],
-                    'venues_editor_title_richtexteditor_help_tab'                          => [
-                        'title'    => esc_html__('Venue Title & Rich Text Editor', 'event_espresso'),
-                        'filename' => 'venues_editor_title_richtexteditor',
-                    ],
-                    'venues_editor_tags_categories_help_tab'                               => [
-                        'title'    => esc_html__('Venue Tags & Categories', 'event_espresso'),
-                        'filename' => 'venues_editor_tags_categories',
-                    ],
-                    'venues_editor_physical_location_google_map_virtual_location_help_tab' => [
-                        'title'    => esc_html__(
-                            'Venue Editor Physical Location & Google Map & Virtual Location',
-                            'event_espresso'
-                        ),
-                        'filename' => 'venues_editor_physical_location_google_map_virtual_location',
-                    ],
-                    'venues_editor_save_new_venue_help_tab'                                => [
-                        'title'    => esc_html__('Save New Venue', 'event_espresso'),
-                        'filename' => 'venues_editor_save_new_venue',
-                    ],
-                    'venues_editor_other_help_tab'                                         => [
-                        'title'    => esc_html__('Venue Editor Other', 'event_espresso'),
-                        'filename' => 'venues_editor_other',
-                    ],
-                ],
-                'metaboxes'     => ['_venue_editor_metaboxes'],
-                'require_nonce' => false,
-            ],
-            'edit'                => [
-                'nav'           => [
-                    'label'      => esc_html__('Edit Venue', 'event_espresso'),
-                    'icon' => 'dashicons-edit-large',
-                    'order'      => 15,
-                    'persistent' => false,
-                    'url'        => $VNU_ID
-                        ? add_query_arg(['post' => $VNU_ID], $this->_current_page_view_url)
-                        : $this->_admin_base_url,
-                ],
-                'help_tabs'     => [
-                    'venues_editor_help_tab'                                               => [
-                        'title'    => esc_html__('Venue Editor', 'event_espresso'),
-                        'filename' => 'venues_editor',
-                    ],
-                    'venues_editor_title_richtexteditor_help_tab'                          => [
-                        'title'    => esc_html__('Venue Title & Rich Text Editor', 'event_espresso'),
-                        'filename' => 'venues_editor_title_richtexteditor',
-                    ],
-                    'venues_editor_tags_categories_help_tab'                               => [
-                        'title'    => esc_html__('Venue Tags & Categories', 'event_espresso'),
-                        'filename' => 'venues_editor_tags_categories',
-                    ],
-                    'venues_editor_physical_location_google_map_virtual_location_help_tab' => [
-                        'title'    => esc_html__(
-                            'Venue Editor Physical Location & Google Map & Virtual Location',
-                            'event_espresso'
-                        ),
-                        'filename' => 'venues_editor_physical_location_google_map_virtual_location',
-                    ],
-                    'venues_editor_save_new_venue_help_tab'                                => [
-                        'title'    => esc_html__('Save New Venue', 'event_espresso'),
-                        'filename' => 'venues_editor_save_new_venue',
-                    ],
-                    'venues_editor_other_help_tab'                                         => [
-                        'title'    => esc_html__('Venue Editor Other', 'event_espresso'),
-                        'filename' => 'venues_editor_other',
-                    ],
-                ],
-                'metaboxes'     => ['_venue_editor_metaboxes'],
-                'require_nonce' => false,
-            ],
-            'google_map_settings' => [
-                'nav'           => [
-                    'label' => esc_html__('Google Maps', 'event_espresso'),
-                    'icon' => 'dashicons-location-alt',
-                    'order' => 40,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_google_maps_help_tab' => [
-                        'title'    => esc_html__('Google Maps', 'event_espresso'),
-                        'filename' => 'general_settings_google_maps',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            // venue category stuff
-            'add_category'        => [
-                'nav'           => [
-                    'label'      => esc_html__('Add Category', 'event_espresso'),
-                    'icon' => 'dashicons-plus-alt',
-                    'order'      => 25,
-                    'persistent' => false,
-                ],
-                'metaboxes'     => ['_publish_post_box'],
-                'help_tabs'     => [
-                    'venues_add_category_help_tab' => [
-                        'title'    => esc_html__('Add New Venue Category', 'event_espresso'),
-                        'filename' => 'venues_add_category',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'edit_category'       => [
-                'nav'           => [
-                    'label'      => esc_html__('Edit Category', 'event_espresso'),
-                    'icon' => 'dashicons-edit-large',
-                    'order'      => 25,
-                    'persistent' => false,
-                    'url'        => $EVT_CAT_ID
-                        ? add_query_arg(['EVT_CAT_ID' => $EVT_CAT_ID], $this->_current_page_view_url)
-                        : $this->_admin_base_url,
-                ],
-                'metaboxes'     => ['_publish_post_box'],
-                'help_tabs'     => [
-                    'venues_edit_category_help_tab' => [
-                        'title'    => esc_html__('Edit Venue Category', 'event_espresso'),
-                        'filename' => 'venues_edit_category',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'category_list'       => [
-                'nav'           => [
-                    'label' => esc_html__('Categories', 'event_espresso'),
-                    'icon' => 'dashicons-networking',
-                    'order' => 20,
-                ],
-                'list_table'    => 'Venue_Categories_Admin_List_Table',
-                'help_tabs'     => [
-                    'venues_categories_help_tab'                       => [
-                        'title'    => esc_html__('Venue Categories', 'event_espresso'),
-                        'filename' => 'venues_categories',
-                    ],
-                    'venues_categories_table_column_headings_help_tab' => [
-                        'title'    => esc_html__('Venue Categories Table Column Headings', 'event_espresso'),
-                        'filename' => 'venues_categories_table_column_headings',
-                    ],
-                    'venues_categories_views_help_tab'                 => [
-                        'title'    => esc_html__('Venue Categories Views', 'event_espresso'),
-                        'filename' => 'venues_categories_views',
-                    ],
-                    'venues_categories_other_help_tab'                 => [
-                        'title'    => esc_html__('Venue Categories Other', 'event_espresso'),
-                        'filename' => 'venues_categories_other',
-                    ],
-                ],
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ],
-        ];
-    }
-
-
-    protected function _add_screen_options()
-    {
-        // todo
-    }
-
-
-    protected function _add_screen_options_default()
-    {
-        $this->_per_page_screen_option();
-    }
-
-
-    protected function _add_screen_options_category_list()
-    {
-        $page_title              = $this->_admin_page_title;
-        $this->_admin_page_title = esc_html__('Venue Categories', 'event_espresso');
-        $this->_per_page_screen_option();
-        $this->_admin_page_title = $page_title;
-    }
-
-
-    // none of the below group are currently used for Event Venues
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles_create_new()
-    {
-        $this->load_scripts_styles_edit();
-    }
-
-
-    public function load_scripts_styles()
-    {
-        wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', [], EVENT_ESPRESSO_VERSION);
-        wp_enqueue_style('ee-cat-admin');
-    }
-
-
-    public function load_scripts_styles_add_category()
-    {
-        $this->load_scripts_styles_edit_category();
-    }
-
-
-    public function load_scripts_styles_edit_category()
-    {
-    }
-
-
-    public function load_scripts_styles_edit()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        wp_register_style(
-            'espresso_venues',
-            EE_VENUES_ASSETS_URL . 'ee-venues-admin.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso_venues');
-    }
-
-
-    protected function _set_list_table_views_default()
-    {
-        $this->_views = [
-            'all' => [
-                'slug'        => 'all',
-                'label'       => esc_html__('View All Venues', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => [],
-            ],
-        ];
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
-            $this->_views['all']['bulk_action'] = [
-                'trash_venues' => esc_html__('Move to Trash', 'event_espresso'),
-            ];
-            $this->_views['trash']              = [
-                'slug'        => 'trash',
-                'label'       => esc_html__('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => [
-                    'restore_venues' => esc_html__('Restore from Trash', 'event_espresso'),
-                    'delete_venues'  => esc_html__('Delete', 'event_espresso'),
-                ],
-            ];
-        }
-    }
-
-
-    protected function _set_list_table_views_category_list()
-    {
-        $this->_views = [
-            'all' => [
-                'slug'        => 'all',
-                'label'       => esc_html__('All', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => [
-                    'delete_categories' => esc_html__('Delete Permanently', 'event_espresso'),
-                ],
-            ],
-        ];
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _overview_list_table()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
-            get_post_type_archive_link('espresso_venues'),
-            esc_html__("View Venue Archive Page", "event_espresso"),
-            'button'
-        );
-
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-            'create_new',
-            'add',
-            [],
-            'add-new-h2'
-        );
-
-        $this->_search_btn_label  = esc_html__('Venues', 'event_espresso');
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function extra_misc_actions_publish_box()
-    {
-        $extra_rows = [
-            'vnu_capacity' => $this->_cpt_model_obj->get_f('VNU_capacity'),
-            'vnu_url'      => $this->_cpt_model_obj->get_f('VNU_url'),
-            'vnu_phone'    => $this->_cpt_model_obj->get_f('VNU_phone'),
-        ];
-        $template   = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
-        EEH_Template::display_template($template, $extra_rows);
-    }
-
-
-    /*************        Google Maps        *************
+	/**
+	 * _venue
+	 * This will hold the venue object for venue_details screen.
+	 *
+	 * @access protected
+	 * @var object
+	 */
+	protected $_venue;
+
+
+	/**
+	 * This will hold the category object for category_details screen.
+	 *
+	 * @var object
+	 */
+	protected $_category;
+
+
+	/**
+	 * This property will hold the venue model instance
+	 *
+	 * @var object
+	 */
+	protected $_venue_model;
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _init_page_props()
+	{
+		require_once(EE_MODELS . 'EEM_Venue.model.php');
+		$this->page_slug        = EE_VENUES_PG_SLUG;
+		$this->_admin_base_url  = EE_VENUES_ADMIN_URL;
+		$this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
+		$this->page_label       = esc_html__('Event Venues', 'event_espresso');
+		$this->_cpt_model_names = [
+			'create_new' => 'EEM_Venue',
+			'edit'       => 'EEM_Venue',
+		];
+		$this->_cpt_edit_routes = [
+			'espresso_venues' => 'edit',
+		];
+		$this->_venue_model     = EEM_Venue::instance();
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ee_venues ajax goes in here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = $this->page_label;
+		$this->_labels           = [
+			'buttons'      => [
+				'add'             => esc_html__('Add New Venue', 'event_espresso'),
+				'edit'            => esc_html__('Edit Venue', 'event_espresso'),
+				'delete'          => esc_html__('Delete Venue', 'event_espresso'),
+				'add_category'    => esc_html__('Add New Category', 'event_espresso'),
+				'edit_category'   => esc_html__('Edit Category', 'event_espresso'),
+				'delete_category' => esc_html__('Delete Category', 'event_espresso'),
+			],
+			'editor_title' => [
+				'espresso_venues' => esc_html__('Enter Venue name here', 'event_espresso'),
+			],
+			'publishbox'   => [
+				'create_new'          => esc_html__('Save New Venue', 'event_espresso'),
+				'edit'                => esc_html__('Update Venue', 'event_espresso'),
+				'add_category'        => esc_html__('Save New Category', 'event_espresso'),
+				'edit_category'       => esc_html__('Update Category', 'event_espresso'),
+				'google_map_settings' => esc_html__('Update Settings', 'event_espresso'),
+			],
+		];
+	}
+
+
+	protected function _set_page_routes()
+	{
+
+		// load formatter helper
+		// load field generator helper
+
+		// is there a vnu_id in the request?
+		$VNU_ID = $this->request->getRequestParam('VNU_ID', 0, 'int');
+		$VNU_ID = $this->request->getRequestParam('post', $VNU_ID, 'int');
+
+		$this->_page_routes = [
+			'default'                    => [
+				'func'       => '_overview_list_table',
+				'capability' => 'ee_read_venues',
+			],
+			'create_new'                 => [
+				'func'       => '_create_new_cpt_item',
+				'capability' => 'ee_edit_venues',
+			],
+			'edit'                       => [
+				'func'       => '_edit_cpt_item',
+				'capability' => 'ee_edit_venue',
+				'obj_id'     => $VNU_ID,
+			],
+			'trash_venue'                => [
+				'func'       => '_trash_or_restore_venue',
+				'args'       => ['venue_status' => 'trash'],
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue',
+				'obj_id'     => $VNU_ID,
+			],
+			'trash_venues'               => [
+				'func'       => '_trash_or_restore_venues',
+				'args'       => ['venue_status' => 'trash'],
+				'noheader'   => true,
+				'capability' => 'ee_delete_venues',
+			],
+			'restore_venue'              => [
+				'func'       => '_trash_or_restore_venue',
+				'args'       => ['venue_status' => 'draft'],
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue',
+				'obj_id'     => $VNU_ID,
+			],
+			'restore_venues'             => [
+				'func'       => '_trash_or_restore_venues',
+				'args'       => ['venue_status' => 'draft'],
+				'noheader'   => true,
+				'capability' => 'ee_delete_venues',
+			],
+			'delete_venues'              => [
+				'func'       => '_delete_venues',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venues',
+			],
+			'delete_venue'               => [
+				'func'       => '_delete_venue',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue',
+				'obj_id'     => $VNU_ID,
+			],
+			// settings related
+			'google_map_settings'        => [
+				'func'       => '_google_map_settings',
+				'capability' => 'manage_options',
+			],
+			'update_google_map_settings' => [
+				'func'       => '_update_google_map_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			// venue category tab related
+			'add_category'               => [
+				'func'       => '_category_details',
+				'args'       => ['add'],
+				'capability' => 'ee_edit_venue_category',
+			],
+			'edit_category'              => [
+				'func'       => '_category_details',
+				'args'       => ['edit'],
+				'capability' => 'ee_edit_venue_category',
+			],
+			'delete_categories'          => [
+				'func'       => '_delete_categories',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue_category',
+			],
+
+			'delete_category' => [
+				'func'       => '_delete_categories',
+				'noheader'   => true,
+				'capability' => 'ee_delete_venue_category',
+			],
+
+			'insert_category' => [
+				'func'       => '_insert_or_update_category',
+				'args'       => ['new_category' => true],
+				'noheader'   => true,
+				'capability' => 'ee_edit_venue_category',
+			],
+
+			'update_category'   => [
+				'func'       => '_insert_or_update_category',
+				'args'       => ['new_category' => false],
+				'noheader'   => true,
+				'capability' => 'ee_edit_venue_category',
+			],
+			'export_categories' => [
+				'func'       => '_categories_export',
+				'noheader'   => true,
+				'capability' => 'export',
+			],
+			'import_categories' => [
+				'func'       => '_import_categories',
+				'capability' => 'import',
+			],
+			'category_list'     => [
+				'func'       => '_category_list_table',
+				'capability' => 'ee_manage_venue_categories',
+			],
+		];
+	}
+
+
+	protected function _set_page_config()
+	{
+		$VNU_ID     = $this->request->getRequestParam('post', 0, 'int');
+		$EVT_CAT_ID = $this->request->getRequestParam('EVT_CAT_ID', 0, 'int');
+
+		$this->_page_config = [
+			'default'             => [
+				'nav'           => [
+					'label' => esc_html__('Overview', 'event_espresso'),
+					'icon' => 'dashicons-list-view',
+					'order' => 10,
+				],
+				'list_table'    => 'Venues_Admin_List_Table',
+				'help_tabs'     => [
+					'venues_overview_help_tab'                           => [
+						'title'    => esc_html__('Venues Overview', 'event_espresso'),
+						'filename' => 'venues_overview',
+					],
+					'venues_overview_table_column_headings_help_tab'     => [
+						'title'    => esc_html__('Venues Overview Table Column Headings', 'event_espresso'),
+						'filename' => 'venues_overview_table_column_headings',
+					],
+					'venues_overview_views_bulk_actions_search_help_tab' => [
+						'title'    => esc_html__('Venues Overview Views & Bulk Actions & Search', 'event_espresso'),
+						'filename' => 'venues_overview_views_bulk_actions_search',
+					],
+				],
+				'metaboxes'     => ['_espresso_news_post_box', '_espresso_links_post_box'],
+				'require_nonce' => false,
+			],
+			'create_new'          => [
+				'nav'           => [
+					'label'      => esc_html__('Add Venue', 'event_espresso'),
+					'icon' => 'dashicons-plus-alt',
+					'order'      => 15,
+					'persistent' => false,
+				],
+				'help_tabs'     => [
+					'venues_editor_help_tab'                                               => [
+						'title'    => esc_html__('Venue Editor', 'event_espresso'),
+						'filename' => 'venues_editor',
+					],
+					'venues_editor_title_richtexteditor_help_tab'                          => [
+						'title'    => esc_html__('Venue Title & Rich Text Editor', 'event_espresso'),
+						'filename' => 'venues_editor_title_richtexteditor',
+					],
+					'venues_editor_tags_categories_help_tab'                               => [
+						'title'    => esc_html__('Venue Tags & Categories', 'event_espresso'),
+						'filename' => 'venues_editor_tags_categories',
+					],
+					'venues_editor_physical_location_google_map_virtual_location_help_tab' => [
+						'title'    => esc_html__(
+							'Venue Editor Physical Location & Google Map & Virtual Location',
+							'event_espresso'
+						),
+						'filename' => 'venues_editor_physical_location_google_map_virtual_location',
+					],
+					'venues_editor_save_new_venue_help_tab'                                => [
+						'title'    => esc_html__('Save New Venue', 'event_espresso'),
+						'filename' => 'venues_editor_save_new_venue',
+					],
+					'venues_editor_other_help_tab'                                         => [
+						'title'    => esc_html__('Venue Editor Other', 'event_espresso'),
+						'filename' => 'venues_editor_other',
+					],
+				],
+				'metaboxes'     => ['_venue_editor_metaboxes'],
+				'require_nonce' => false,
+			],
+			'edit'                => [
+				'nav'           => [
+					'label'      => esc_html__('Edit Venue', 'event_espresso'),
+					'icon' => 'dashicons-edit-large',
+					'order'      => 15,
+					'persistent' => false,
+					'url'        => $VNU_ID
+						? add_query_arg(['post' => $VNU_ID], $this->_current_page_view_url)
+						: $this->_admin_base_url,
+				],
+				'help_tabs'     => [
+					'venues_editor_help_tab'                                               => [
+						'title'    => esc_html__('Venue Editor', 'event_espresso'),
+						'filename' => 'venues_editor',
+					],
+					'venues_editor_title_richtexteditor_help_tab'                          => [
+						'title'    => esc_html__('Venue Title & Rich Text Editor', 'event_espresso'),
+						'filename' => 'venues_editor_title_richtexteditor',
+					],
+					'venues_editor_tags_categories_help_tab'                               => [
+						'title'    => esc_html__('Venue Tags & Categories', 'event_espresso'),
+						'filename' => 'venues_editor_tags_categories',
+					],
+					'venues_editor_physical_location_google_map_virtual_location_help_tab' => [
+						'title'    => esc_html__(
+							'Venue Editor Physical Location & Google Map & Virtual Location',
+							'event_espresso'
+						),
+						'filename' => 'venues_editor_physical_location_google_map_virtual_location',
+					],
+					'venues_editor_save_new_venue_help_tab'                                => [
+						'title'    => esc_html__('Save New Venue', 'event_espresso'),
+						'filename' => 'venues_editor_save_new_venue',
+					],
+					'venues_editor_other_help_tab'                                         => [
+						'title'    => esc_html__('Venue Editor Other', 'event_espresso'),
+						'filename' => 'venues_editor_other',
+					],
+				],
+				'metaboxes'     => ['_venue_editor_metaboxes'],
+				'require_nonce' => false,
+			],
+			'google_map_settings' => [
+				'nav'           => [
+					'label' => esc_html__('Google Maps', 'event_espresso'),
+					'icon' => 'dashicons-location-alt',
+					'order' => 40,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_google_maps_help_tab' => [
+						'title'    => esc_html__('Google Maps', 'event_espresso'),
+						'filename' => 'general_settings_google_maps',
+					],
+				],
+				'require_nonce' => false,
+			],
+			// venue category stuff
+			'add_category'        => [
+				'nav'           => [
+					'label'      => esc_html__('Add Category', 'event_espresso'),
+					'icon' => 'dashicons-plus-alt',
+					'order'      => 25,
+					'persistent' => false,
+				],
+				'metaboxes'     => ['_publish_post_box'],
+				'help_tabs'     => [
+					'venues_add_category_help_tab' => [
+						'title'    => esc_html__('Add New Venue Category', 'event_espresso'),
+						'filename' => 'venues_add_category',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'edit_category'       => [
+				'nav'           => [
+					'label'      => esc_html__('Edit Category', 'event_espresso'),
+					'icon' => 'dashicons-edit-large',
+					'order'      => 25,
+					'persistent' => false,
+					'url'        => $EVT_CAT_ID
+						? add_query_arg(['EVT_CAT_ID' => $EVT_CAT_ID], $this->_current_page_view_url)
+						: $this->_admin_base_url,
+				],
+				'metaboxes'     => ['_publish_post_box'],
+				'help_tabs'     => [
+					'venues_edit_category_help_tab' => [
+						'title'    => esc_html__('Edit Venue Category', 'event_espresso'),
+						'filename' => 'venues_edit_category',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'category_list'       => [
+				'nav'           => [
+					'label' => esc_html__('Categories', 'event_espresso'),
+					'icon' => 'dashicons-networking',
+					'order' => 20,
+				],
+				'list_table'    => 'Venue_Categories_Admin_List_Table',
+				'help_tabs'     => [
+					'venues_categories_help_tab'                       => [
+						'title'    => esc_html__('Venue Categories', 'event_espresso'),
+						'filename' => 'venues_categories',
+					],
+					'venues_categories_table_column_headings_help_tab' => [
+						'title'    => esc_html__('Venue Categories Table Column Headings', 'event_espresso'),
+						'filename' => 'venues_categories_table_column_headings',
+					],
+					'venues_categories_views_help_tab'                 => [
+						'title'    => esc_html__('Venue Categories Views', 'event_espresso'),
+						'filename' => 'venues_categories_views',
+					],
+					'venues_categories_other_help_tab'                 => [
+						'title'    => esc_html__('Venue Categories Other', 'event_espresso'),
+						'filename' => 'venues_categories_other',
+					],
+				],
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			],
+		];
+	}
+
+
+	protected function _add_screen_options()
+	{
+		// todo
+	}
+
+
+	protected function _add_screen_options_default()
+	{
+		$this->_per_page_screen_option();
+	}
+
+
+	protected function _add_screen_options_category_list()
+	{
+		$page_title              = $this->_admin_page_title;
+		$this->_admin_page_title = esc_html__('Venue Categories', 'event_espresso');
+		$this->_per_page_screen_option();
+		$this->_admin_page_title = $page_title;
+	}
+
+
+	// none of the below group are currently used for Event Venues
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles_create_new()
+	{
+		$this->load_scripts_styles_edit();
+	}
+
+
+	public function load_scripts_styles()
+	{
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('ee-cat-admin');
+	}
+
+
+	public function load_scripts_styles_add_category()
+	{
+		$this->load_scripts_styles_edit_category();
+	}
+
+
+	public function load_scripts_styles_edit_category()
+	{
+	}
+
+
+	public function load_scripts_styles_edit()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		wp_register_style(
+			'espresso_venues',
+			EE_VENUES_ASSETS_URL . 'ee-venues-admin.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso_venues');
+	}
+
+
+	protected function _set_list_table_views_default()
+	{
+		$this->_views = [
+			'all' => [
+				'slug'        => 'all',
+				'label'       => esc_html__('View All Venues', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => [],
+			],
+		];
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
+			$this->_views['all']['bulk_action'] = [
+				'trash_venues' => esc_html__('Move to Trash', 'event_espresso'),
+			];
+			$this->_views['trash']              = [
+				'slug'        => 'trash',
+				'label'       => esc_html__('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => [
+					'restore_venues' => esc_html__('Restore from Trash', 'event_espresso'),
+					'delete_venues'  => esc_html__('Delete', 'event_espresso'),
+				],
+			];
+		}
+	}
+
+
+	protected function _set_list_table_views_category_list()
+	{
+		$this->_views = [
+			'all' => [
+				'slug'        => 'all',
+				'label'       => esc_html__('All', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => [
+					'delete_categories' => esc_html__('Delete Permanently', 'event_espresso'),
+				],
+			],
+		];
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _overview_list_table()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
+			get_post_type_archive_link('espresso_venues'),
+			esc_html__("View Venue Archive Page", "event_espresso"),
+			'button'
+		);
+
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+			'create_new',
+			'add',
+			[],
+			'add-new-h2'
+		);
+
+		$this->_search_btn_label  = esc_html__('Venues', 'event_espresso');
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function extra_misc_actions_publish_box()
+	{
+		$extra_rows = [
+			'vnu_capacity' => $this->_cpt_model_obj->get_f('VNU_capacity'),
+			'vnu_url'      => $this->_cpt_model_obj->get_f('VNU_url'),
+			'vnu_phone'    => $this->_cpt_model_obj->get_f('VNU_phone'),
+		];
+		$template   = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
+		EEH_Template::display_template($template, $extra_rows);
+	}
+
+
+	/*************        Google Maps        *************
      *
      * @throws EE_Error
      * @throws EE_Error
      */
 
 
-    protected function _google_map_settings()
-    {
-
-
-        $this->_template_args['values']           = $this->_yes_no_values;
-        $default_map_settings                     = new stdClass();
-        $default_map_settings->use_google_maps    = true;
-        $default_map_settings->google_map_api_key = '';
-        // for event details pages (reg page)
-        $default_map_settings->event_details_map_width    = 585;
-        // ee_map_width_single
-        $default_map_settings->event_details_map_height   = 362;
-        // ee_map_height_single
-        $default_map_settings->event_details_map_zoom     = 14;
-        // ee_map_zoom_single
-        $default_map_settings->event_details_display_nav  = true;
-        // ee_map_nav_display_single
-        $default_map_settings->event_details_nav_size     = false;
-        // ee_map_nav_size_single
-        $default_map_settings->event_details_control_type = 'default';
-        // ee_map_type_control_single
-        $default_map_settings->event_details_map_align    = 'center';
-        // ee_map_align_single
-
-        // for event list pages
-        $default_map_settings->event_list_map_width    = 300;
-        // ee_map_width
-        $default_map_settings->event_list_map_height   = 185;
-        // ee_map_height
-        $default_map_settings->event_list_map_zoom     = 12;
-        // ee_map_zoom
-        $default_map_settings->event_list_display_nav  = false;
-        // ee_map_nav_display
-        $default_map_settings->event_list_nav_size     = true;
-        // ee_map_nav_size
-        $default_map_settings->event_list_control_type = 'dropdown';
-        // ee_map_type_control
-        $default_map_settings->event_list_map_align    = 'center';
-        // ee_map_align
-
-        $this->_template_args['map_settings'] =
-            isset(EE_Registry::instance()->CFG->map_settings)
-            && ! empty(EE_Registry::instance()->CFG->map_settings)
-                ? (object) array_merge(
-                    (array) $default_map_settings,
-                    (array) EE_Registry::instance()->CFG->map_settings
-                )
-                : $default_map_settings;
-
-        $this->_set_add_edit_form_tags('update_google_map_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_VENUES_TEMPLATE_PATH . 'google_map.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _update_google_map_settings()
-    {
-        $map_settings = EE_Registry::instance()->CFG->map_settings;
-
-        $settings = [
-            'use_google_maps'            => 'int',
-            'google_map_api_key'         => 'string',
-            'event_details_map_width'    => 'int',
-            'event_details_map_zoom'     => 'int',
-            'event_details_display_nav'  => 'int',
-            'event_details_nav_size'     => 'int',
-            'event_details_control_type' => 'string',
-            'event_details_map_align'    => 'string',
-            'event_list_map_width'       => 'int',
-            'event_list_map_height'      => 'int',
-            'event_list_map_zoom'        => 'int',
-            'event_list_display_nav'     => 'int',
-            'event_list_nav_size'        => 'int',
-            'event_list_control_type'    => 'string',
-            'event_list_map_align'       => 'string',
-        ];
-
-        foreach ($settings as $setting => $type) {
-            $map_settings->{$setting} = $this->request->getRequestParam($setting, $map_settings->{$setting}, $type);
-        }
-
-        EE_Registry::instance()->CFG->map_settings = apply_filters(
-            'FHEE__Extend_General_Settings_Admin_Page___update_google_map_settings__CFG_map_settings',
-            $map_settings
-        );
-
-        $what    = 'Google Map Settings';
-        $success = $this->_update_espresso_configuration(
-            $what,
-            EE_Registry::instance()->CFG->map_settings,
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        $this->_redirect_after_action($success, $what, 'updated', ['action' => 'google_map_settings']);
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _venue_editor_metaboxes()
-    {
-        $this->verify_cpt_object();
-
-        $this->addMetaBox(
-            'espresso_venue_address_options',
-            esc_html__('Physical Location', 'event_espresso'),
-            [$this, 'venue_address_metabox'],
-            $this->page_slug,
-            'side'
-        );
-        $this->addMetaBox(
-            'espresso_venue_gmap_options',
-            esc_html__('Google Map', 'event_espresso'),
-            [$this, 'venue_gmap_metabox'],
-            $this->page_slug,
-            'side'
-        );
-        $this->addMetaBox(
-            'espresso_venue_virtual_loc_options',
-            esc_html__('Virtual Location', 'event_espresso'),
-            [$this, 'venue_virtual_loc_metabox'],
-            $this->page_slug,
-            'side'
-        );
-    }
-
-
-    public function venue_gmap_metabox()
-    {
-        $template_args = [
-            'vnu_enable_for_gmap' => EEH_Form_Fields::select_input(
-                'vnu_enable_for_gmap',
-                $this->get_yes_no_values(),
-                $this->_cpt_model_obj instanceof EE_Venue ? $this->_cpt_model_obj->enable_for_gmap() : false
-            ),
-            'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
-        ];
-        $template      = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function venue_address_metabox()
-    {
-        $template_args['_venue'] = $this->_cpt_model_obj;
-
-        $template_args['states_dropdown']    = EEH_Form_Fields::generate_form_input(
-            new EE_Question_Form_Input(
-                EE_Question::new_instance(
-                    ['QST_display_text' => esc_html__('State', 'event_espresso'), 'QST_system' => 'state']
-                ),
-                EE_Answer::new_instance(
-                    [
-                        'ANS_value' => $this->_cpt_model_obj instanceof EE_Venue
-                            ? $this->_cpt_model_obj->state_ID()
-                            : 0,
-                    ]
-                ),
-                [
-                    'input_name'     => 'sta_id',
-                    'input_id'       => 'sta_id',
-                    'input_class'    => '',
-                    'input_prefix'   => '',
-                    'append_qstn_id' => false,
-                ]
-            )
-        );
-        $template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
-            new EE_Question_Form_Input(
-                EE_Question::new_instance(
-                    ['QST_display_text' => esc_html__('Country', 'event_espresso'), 'QST_system' => 'country']
-                ),
-                EE_Answer::new_instance(
-                    [
-                        'ANS_value' => $this->_cpt_model_obj instanceof EE_Venue
-                            ? $this->_cpt_model_obj->country_ID()
-                            : 0,
-                    ]
-                ),
-                [
-                    'input_name'     => 'cnt_iso',
-                    'input_id'       => 'cnt_iso',
-                    'input_class'    => '',
-                    'input_prefix'   => '',
-                    'append_qstn_id' => false,
-                ]
-            )
-        );
-
-        $template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
-
-
-    public function venue_virtual_loc_metabox()
-    {
-        $template_args = [
-            '_venue' => $this->_cpt_model_obj,
-        ];
-        $template      = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
-
-
-    protected function _restore_cpt_item($post_id, $revision_id)
-    {
-        $venue_obj = $this->_venue_model->get_one_by_ID($post_id);
-
-        // meta revision restore
-        $venue_obj->restore_revision($revision_id);
-    }
-
-
-    /**
-     * Handles updates for venue cpts
-     *
-     * @param int    $post_id ID of Venue CPT
-     * @param WP_Post $post    Post object (with "blessed" WP properties)
-     * @return void
-     */
-    protected function _insert_update_cpt_item($post_id, $post)
-    {
-
-        if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
-            return;// get out we're not processing the saving of venues.
-        }
-
-        $wheres = [$this->_venue_model->primary_key_name() => $post_id];
-
-        $venue_values = [
-            'VNU_address'         => $this->request->getRequestParam('vnu_address'),
-            'VNU_address2'        => $this->request->getRequestParam('vnu_address2'),
-            'VNU_city'            => $this->request->getRequestParam('vnu_city'),
-            'STA_ID'              => $this->request->getRequestParam('sta_id'),
-            'CNT_ISO'             => $this->request->getRequestParam('cnt_iso'),
-            'VNU_zip'             => $this->request->getRequestParam('vnu_zip'),
-            'VNU_phone'           => $this->request->getRequestParam('vnu_phone'),
-            'VNU_capacity'        => $this->request->requestParamIsSet('vnu_capacity')
-                ? str_replace(',', '', $this->request->getRequestParam('vnu_capacity'))
-                : EE_INF,
-            'VNU_url'             => $this->request->getRequestParam('vnu_url'),
-            'VNU_virtual_phone'   => $this->request->getRequestParam('vnu_virtual_phone'),
-            'VNU_virtual_url'     => $this->request->getRequestParam('vnu_virtual_url'),
-            'VNU_enable_for_gmap' => $this->request->getRequestParam('vnu_enable_for_gmap', false, 'bool'),
-            'VNU_google_map_link' => $this->request->getRequestParam('vnu_google_map_link'),
-        ];
-
-        // update venue
-        $success = $this->_venue_model->update($venue_values, [$wheres]);
-
-        // get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-        $get_one_where = [$this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status];
-        $venue         = $this->_venue_model->get_one([$get_one_where]);
-
-        // notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
-        $venue_update_callbacks = apply_filters(
-            'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks',
-            []
-        );
-        $att_success            = true;
-        foreach ($venue_update_callbacks as $v_callback) {
-            // if ANY of these updates fail then we want the appropriate global error message
-            $att_success = call_user_func_array($v_callback, [$venue, $this->request->requestParams()])
-                ? $att_success
-                : false;
-        }
-
-        // any errors?
-        if ($success && ! $att_success) {
-            EE_Error::add_error(
-                esc_html__(
-                    'Venue Details saved successfully but something went wrong with saving attachments.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        } elseif ($success === false) {
-            EE_Error::add_error(
-                esc_html__('Venue Details did not save successfully.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
-
-
-    /**
-     * @param int $post_id
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function trash_cpt_item($post_id)
-    {
-        $this->request->setRequestParam('VNU_ID', $post_id);
-        $this->_trash_or_restore_venue('trash', false);
-    }
-
-
-    /**
-     * @param int $post_id
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function restore_cpt_item($post_id)
-    {
-        $this->request->setRequestParam('VNU_ID', $post_id);
-        $this->_trash_or_restore_venue('draft', false);
-    }
-
-
-    /**
-     * @param int $post_id
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function delete_cpt_item($post_id)
-    {
-        $this->request->setRequestParam('VNU_ID', $post_id);
-        $this->_delete_venue(false);
-    }
-
-
-    public function get_venue_object()
-    {
-        return $this->_cpt_model_obj;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _trash_or_restore_venue($venue_status = 'trash', $redirect_after = true)
-    {
-        $VNU_ID = $this->request->getRequestParam('VNU_ID', 0, 'int');
-
-        // loop thru venues
-        if ($VNU_ID) {
-            // clean status
-            $venue_status = sanitize_key($venue_status);
-            // grab status
-            if (! empty($venue_status)) {
-                $success = $this->_change_venue_status($VNU_ID, $venue_status);
-            } else {
-                $success = false;
-                $msg     = esc_html__(
-                    'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
-                    'event_espresso'
-                );
-                EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            }
-        } else {
-            $success = false;
-            $msg     = esc_html__(
-                'An error occurred. The venue could not be moved to the trash because a valid venue ID was not not supplied.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        $action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-
-        if ($redirect_after) {
-            $this->_redirect_after_action($success, 'Venue', $action, ['action' => 'default']);
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _trash_or_restore_venues($venue_status = 'trash')
-    {
-        // clean status
-        $venue_status = sanitize_key($venue_status);
-        // grab status
-        if (! empty($venue_status)) {
-            $success = true;
-            // determine the event id and set to array.
-            $VNU_IDs = $this->request->getRequestParam('venue_id', [], 'int', true);
-            // loop thru events
-            foreach ($VNU_IDs as $VNU_ID) {
-                if ($VNU_ID = absint($VNU_ID)) {
-                    $results = $this->_change_venue_status($VNU_ID, $venue_status);
-                    $success = $results !== false ? $success : false;
-                } else {
-                    $msg = sprintf(
-                        esc_html__(
-                            'An error occurred. Venue #%d could not be moved to the trash because a valid venue ID was not not supplied.',
-                            'event_espresso'
-                        ),
-                        $VNU_ID
-                    );
-                    EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-                    $success = false;
-                }
-            }
-        } else {
-            $success = false;
-            $msg     = esc_html__(
-                'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        // in order to force a pluralized result message we need to send back a success status greater than 1
-        $success = $success ? 2 : false;
-        $action  = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-        $this->_redirect_after_action($success, 'Venues', $action, ['action' => 'default']);
-    }
-
-
-    /**
-     * _trash_or_restore_venues
-     *
-     * //todo this is pretty much the same as the corresponding change_event_status method in Events_Admin_Page.  We
-     * should probably abstract this up to the EE_Admin_Page_CPT (or even EE_Admin_Page) and make this a common method
-     * accepting a certain number of params.
-     *
-     * @access  private
-     * @param int    $VNU_ID
-     * @param string $venue_status
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _change_venue_status($VNU_ID = 0, $venue_status = '')
-    {
-        // grab venue id
-        if (! $VNU_ID) {
-            $msg = esc_html__('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-        $this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-
-        // clean status
-        $venue_status = sanitize_key($venue_status);
-        // grab status
-        if (! $venue_status) {
-            $msg = esc_html__(
-                'An error occurred. No Venue Status or an invalid Venue Status was received.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-        // was event trashed or restored ?
-        switch ($venue_status) {
-            case 'draft':
-                $action = 'restored from the trash';
-                $hook   = 'AHEE_venue_restored_from_trash';
-                break;
-            case 'trash':
-                $action = 'moved to the trash';
-                $hook   = 'AHEE_venue_moved_to_trash';
-                break;
-            default:
-                $action = 'updated';
-                $hook   = false;
-        }
-        // use class to change status
-        $this->_cpt_model_obj->set_status($venue_status);
-        $success = $this->_cpt_model_obj->save();
-
-        if ($success === false) {
-            $msg = sprintf(esc_html__('An error occurred. The venue could not be %s.', 'event_espresso'), $action);
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        if ($hook) {
-            do_action($hook);
-        }
-        return true;
-    }
-
-
-    /**
-     * @param bool $redirect_after
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _delete_venue($redirect_after = true)
-    {
-        // determine the venue id and set to array.
-        $VNU_ID = $this->request->getRequestParam('VNU_ID', 0, 'int');
-        $VNU_ID = $this->request->getRequestParam('post', $VNU_ID, 'int');
-
-        // loop thru venues
-        if ($VNU_ID) {
-            $success = $this->_delete_or_trash_venue($VNU_ID);
-        } else {
-            $success = false;
-            $msg     = esc_html__(
-                'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        if ($redirect_after) {
-            $this->_redirect_after_action($success, 'Venue', 'deleted', ['action' => 'default']);
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _delete_venues()
-    {
-        $success = true;
-        // determine the event id and set to array.
-        $VNU_IDs = $this->request->getRequestParam('venue_id', [], 'int', true);
-        // loop thru events
-        foreach ($VNU_IDs as $VNU_ID) {
-            if ($VNU_ID = absint($VNU_ID)) {
-                $results = $this->_delete_or_trash_venue($VNU_ID);
-                $success = $results !== false ? $success : false;
-            } else {
-                $success = false;
-                $msg     = esc_html__(
-                    'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
-                    'event_espresso'
-                );
-                EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            }
-        }
-        // in order to force a pluralized result message we need to send back a success status greater than 1
-        $success = $success ? 2 : false;
-        $this->_redirect_after_action(
-            $success,
-            esc_html__('Venues', 'event_espresso'),
-            esc_html__('deleted', 'event_espresso'),
-            ['action' => 'default']
-        );
-    }
-
-
-    // todo: put in parent
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _delete_or_trash_venue($VNU_ID = false)
-    {
-        // grab event id
-        if (! $VNU_ID = absint($VNU_ID)) {
-            $msg = esc_html__('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-
-        $venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-        // first need to remove all term relationships
-        $venue->_remove_relations('Term_Taxonomy');
-        $success = $venue->delete_permanently();
-        // did it all go as planned ?
-        if ($success) {
-            $msg = sprintf(esc_html__('Venue ID # %d has been deleted.', 'event_espresso'), $VNU_ID);
-            EE_Error::add_success($msg);
-        } else {
-            $msg =
-                sprintf(
-                    esc_html__('An error occurred. Venue ID # %d could not be deleted.', 'event_espresso'),
-                    $VNU_ID
-                );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
-        return true;
-    }
-
-
-
-
-    /***********/
-    /* QUERIES */
-
-
-    public function get_venues($per_page = 10, $count = false)
-    {
-
-        $orderby = $this->request->getRequestParam('orderby', '');
-
-        switch ($orderby) {
-            case 'id':
-                $orderby = 'VNU_ID';
-                break;
-
-            case 'capacity':
-                $orderby = 'VNU_capacity';
-                break;
-
-            case 'city':
-                $orderby = 'VNU_city';
-                break;
-
-            default:
-                $orderby = 'VNU_name';
-        }
-
-        $sort         = $this->request->getRequestParam('order', 'ASC');
-        $current_page = $this->request->getRequestParam('paged', 1, 'int');
-        $per_page     = ! empty($per_page) ? $per_page : 10;
-        $per_page     = $this->request->getRequestParam('perpage', $per_page, 'int');
-
-        $offset = ($current_page - 1) * $per_page;
-        $limit  = [$offset, $per_page];
-
-        $category = $this->request->getRequestParam('category');
-        $category = $category > 0 ? $category : null;
-
-        $where = [];
-
-        // only set initial status if it is in the incoming request.  Otherwise the "all" view display's all statuses.
-        $status = $this->request->getRequestParam('status');
-        if ($status && $status !== 'all') {
-            $where['status'] = $status;
-        }
-
-        $venue_status = $this->request->getRequestParam('venue_status');
-        if ($venue_status) {
-            $where['status'] = $venue_status;
-        }
-
-
-        if ($category) {
-            $where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
-            $where['Term_Taxonomy.term_id']  = $category;
-        }
-
-
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
-            $where['VNU_wp_user'] = get_current_user_id();
-        } else {
-            if (! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
-                $where['OR'] = [
-                    'status*restrict_private' => ['!=', 'private'],
-                    'AND'                     => [
-                        'status*inclusive' => ['=', 'private'],
-                        'VNU_wp_user'      => get_current_user_id(),
-                    ],
-                ];
-            }
-        }
-
-        $search_term = $this->request->getRequestParam('s');
-        if ($search_term) {
-            $search_term = '%' . $search_term . '%';
-            $where['OR'] = [
-                'VNU_name'               => ['LIKE', $search_term],
-                'VNU_desc'               => ['LIKE', $search_term],
-                'VNU_short_desc'         => ['LIKE', $search_term],
-                'VNU_address'            => ['LIKE', $search_term],
-                'VNU_address2'           => ['LIKE', $search_term],
-                'VNU_city'               => ['LIKE', $search_term],
-                'VNU_zip'                => ['LIKE', $search_term],
-                'VNU_phone'              => ['LIKE', $search_term],
-                'VNU_url'                => ['LIKE', $search_term],
-                'VNU_virtual_phone'      => ['LIKE', $search_term],
-                'VNU_virtual_url'        => ['LIKE', $search_term],
-                'VNU_google_map_link'    => ['LIKE', $search_term],
-                'Event.EVT_name'         => ['LIKE', $search_term],
-                'Event.EVT_desc'         => ['LIKE', $search_term],
-                'Event.EVT_phone'        => ['LIKE', $search_term],
-                'Event.EVT_external_URL' => ['LIKE', $search_term],
-            ];
-        }
-
-
-        return $count
-            ? $this->_venue_model->count([$where], 'VNU_ID')
-            : $this->_venue_model->get_all(
-                [$where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort]
-            );
-    }
-
-
-
-
-    /** Venue Category Stuff **/
-
-    /**
-     * set the _category property with the category object for the loaded page.
-     *
-     * @access private
-     * @return void
-     */
-    private function _set_category_object()
-    {
-        if (isset($this->_category->id) && ! empty($this->_category->id)) {
-            return;
-        } // already have the category object so get out.
-
-        // set default category object
-        $this->_set_empty_category_object();
-
-        // only set if we've got an id
-        $category_ID = $this->request->getRequestParam('VEN_CAT_ID', 0, 'int');
-        if (! $category_ID) {
-            return;
-        }
-
-        $term = get_term($category_ID, 'espresso_venue_categories');
-
-
-        if (! empty($term)) {
-            $this->_category->category_name       = $term->name;
-            $this->_category->category_identifier = $term->slug;
-            $this->_category->category_desc       = $term->description;
-            $this->_category->id                  = $term->term_id;
-            $this->_category->parent              = $term->parent;
-        }
-    }
-
-
-    private function _set_empty_category_object()
-    {
-        $this->_category                = new stdClass();
-        $this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
-        $this->_category->id            = $this->_category->parent = 0;
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _category_list_table()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-            'add_category',
-            'add_category',
-            [],
-            'add-new-h2'
-        );
-        $this->_search_btn_label = esc_html__('Venue Categories', 'event_espresso');
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _category_details($view)
-    {
-
-        // load formatter helper
-        // load field generator helper
-
-        $route = $view == 'edit' ? 'update_category' : 'insert_category';
-        $this->_set_add_edit_form_tags($route);
-
-        $this->_set_category_object();
-        $id = ! empty($this->_category->id) ? $this->_category->id : '';
-
-        $delete_action = 'delete_category';
-
-        $redirect = EE_Admin_Page::add_query_args_and_nonce(['action' => 'category_list'], $this->_admin_base_url);
-
-        $this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
-
-        // take care of contents
-        $this->_template_args['admin_page_content'] = $this->_category_details_content();
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _category_details_content()
-    {
-        $editor_args['category_desc'] = [
-            'type'          => 'wp_editor',
-            'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
-            'class'         => 'my_editor_custom',
-            'wpeditor_args' => ['media_buttons' => false],
-        ];
-        $_wp_editor                   = $this->_generate_admin_form_fields($editor_args, 'array');
-
-        $all_terms = get_terms(
-            ['espresso_venue_categories'],
-            ['hide_empty' => 0, 'exclude' => [$this->_category->id]]
-        );
-
-        // setup category select for term parents.
-        $category_select_values[] = [
-            'text' => esc_html__('No Parent', 'event_espresso'),
-            'id'   => 0,
-        ];
-        foreach ($all_terms as $term) {
-            $category_select_values[] = [
-                'text' => $term->name,
-                'id'   => $term->term_id,
-            ];
-        }
-
-        $category_select = EEH_Form_Fields::select_input(
-            'category_parent',
-            $category_select_values,
-            $this->_category->parent
-        );
-        $template_args   = [
-            'category'                 => $this->_category,
-            'category_select'          => $category_select,
-            'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
-            'category_desc_editor'     => $_wp_editor['category_desc']['field'],
-            'disable'                  => '',
-            'disabled_message'         => false,
-        ];
-        $template        = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-        return EEH_Template::display_template($template, $template_args, true);
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _delete_categories()
-    {
-        $category_ID  = $this->request->getRequestParam('category_id', 0, 'int');
-        $category_IDs = $this->request->getRequestParam('VEN_CAT_ID', [$category_ID], 'int', true);
-
-        foreach ($category_IDs as $cat_id) {
-            $this->_delete_category($cat_id);
-        }
-
-        // doesn't matter what page we're coming from... we're going to the same place after delete.
-        $query_args = [
-            'action' => 'category_list',
-        ];
-        $this->_redirect_after_action(0, '', '', $query_args);
-    }
-
-
-    protected function _delete_category($cat_id)
-    {
-        $cat_id = absint($cat_id);
-        wp_delete_term($cat_id, 'espresso_venue_categories');
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _insert_or_update_category($new_category)
-    {
-
-        $cat_id  = $new_category ? $this->_insert_category() : $this->_insert_category(true);
-        $success = 0; // we already have a success message so lets not send another.
-        if ($cat_id) {
-            $query_args = [
-                'action'     => 'edit_category',
-                'VEN_CAT_ID' => $cat_id,
-            ];
-        } else {
-            $query_args = ['action' => 'add_category'];
-        }
-        $this->_redirect_after_action($success, '', '', $query_args, true);
-    }
-
-
-    private function _insert_category($update = false)
-    {
-        $category_ID     = $update ? $this->request->getRequestParam('VEN_CAT_ID', '', 'int') : '';
-        $category_name   = $this->request->getRequestParam('category_name', '');
-        $category_desc   = $this->request->getRequestParam('category_desc', '', 'html');
-        $category_parent = $this->request->getRequestParam('category_parent', 0, 'int');
-
-        if (empty($category_name)) {
-            $msg = esc_html__('You must add a name for the category.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-
-
-        $term_args = [
-            'name'        => $category_name,
-            'description' => $category_desc,
-            'parent'      => $category_parent,
-        ];
-
-        $insert_ids = $update
-            ? wp_update_term($category_ID, 'espresso_venue_categories', $term_args)
-            : wp_insert_term(
-                $category_name,
-                'espresso_venue_categories',
-                $term_args
-            );
-
-        if (! is_array($insert_ids)) {
-            EE_Error::add_error(
-                esc_html__('An error occurred and the category has not been saved to the database.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        } else {
-            $category_ID = $insert_ids['term_id'];
-            EE_Error::add_success(
-                sprintf(
-                    esc_html__('The category %s was successfully created', 'event_espresso'),
-                    $category_name
-                )
-            );
-        }
-
-        return $category_ID;
-    }
-
-
-    /**
-     * TODO handle category exports()
-     *
-     * @return void
-     */
-    protected function _categories_export()
-    {
-        // todo: I don't like doing this but it'll do until we modify EE_Export Class.
-        $this->request->mergeRequestParams(
-            [
-                'export'       => 'report',
-                'action'       => 'categories',
-                'category_ids' => $this->request->getRequestParam('VEN_CAT_ID', 0, 'int'),
-            ]
-        );
-
-        if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-            require_once(EE_CLASSES . 'EE_Export.class.php');
-            $EE_Export = EE_Export::instance($this->request->requestParams());
-            $EE_Export->export();
-        }
-    }
-
-
-    protected function _import_categories()
-    {
-
-        require_once(EE_CLASSES . 'EE_Import.class.php');
-        EE_Import::instance()->import();
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    public function get_categories($per_page = 10, $current_page = 1, $count = false)
-    {
-
-        // testing term stuff
-        $orderby     = $this->request->getRequestParam('orderby', 'Term.term_id');
-        $order       = $this->request->getRequestParam('order', 'DESC');
-        $limit       = ($current_page - 1) * $per_page;
-        $where       = ['taxonomy' => 'espresso_venue_categories'];
-        $search_term = $this->request->getRequestParam('s');
-        if ($search_term) {
-            $search_term = '%' . $search_term . '%';
-            $where['OR'] = [
-                'Term.name'   => ['LIKE', $search_term],
-                'description' => ['LIKE', $search_term],
-            ];
-        }
-
-        $query_params = [
-            $where,
-            'order_by'   => [$orderby => $order],
-            'limit'      => $limit . ',' . $per_page,
-            'force_join' => ['Term'],
-        ];
-
-        return $count
-            ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
-            : EEM_Term_Taxonomy::instance()->get_all($query_params);
-    }
-
-
-    /* end category stuff */
-    /**************/
+	protected function _google_map_settings()
+	{
+
+
+		$this->_template_args['values']           = $this->_yes_no_values;
+		$default_map_settings                     = new stdClass();
+		$default_map_settings->use_google_maps    = true;
+		$default_map_settings->google_map_api_key = '';
+		// for event details pages (reg page)
+		$default_map_settings->event_details_map_width    = 585;
+		// ee_map_width_single
+		$default_map_settings->event_details_map_height   = 362;
+		// ee_map_height_single
+		$default_map_settings->event_details_map_zoom     = 14;
+		// ee_map_zoom_single
+		$default_map_settings->event_details_display_nav  = true;
+		// ee_map_nav_display_single
+		$default_map_settings->event_details_nav_size     = false;
+		// ee_map_nav_size_single
+		$default_map_settings->event_details_control_type = 'default';
+		// ee_map_type_control_single
+		$default_map_settings->event_details_map_align    = 'center';
+		// ee_map_align_single
+
+		// for event list pages
+		$default_map_settings->event_list_map_width    = 300;
+		// ee_map_width
+		$default_map_settings->event_list_map_height   = 185;
+		// ee_map_height
+		$default_map_settings->event_list_map_zoom     = 12;
+		// ee_map_zoom
+		$default_map_settings->event_list_display_nav  = false;
+		// ee_map_nav_display
+		$default_map_settings->event_list_nav_size     = true;
+		// ee_map_nav_size
+		$default_map_settings->event_list_control_type = 'dropdown';
+		// ee_map_type_control
+		$default_map_settings->event_list_map_align    = 'center';
+		// ee_map_align
+
+		$this->_template_args['map_settings'] =
+			isset(EE_Registry::instance()->CFG->map_settings)
+			&& ! empty(EE_Registry::instance()->CFG->map_settings)
+				? (object) array_merge(
+					(array) $default_map_settings,
+					(array) EE_Registry::instance()->CFG->map_settings
+				)
+				: $default_map_settings;
+
+		$this->_set_add_edit_form_tags('update_google_map_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_VENUES_TEMPLATE_PATH . 'google_map.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _update_google_map_settings()
+	{
+		$map_settings = EE_Registry::instance()->CFG->map_settings;
+
+		$settings = [
+			'use_google_maps'            => 'int',
+			'google_map_api_key'         => 'string',
+			'event_details_map_width'    => 'int',
+			'event_details_map_zoom'     => 'int',
+			'event_details_display_nav'  => 'int',
+			'event_details_nav_size'     => 'int',
+			'event_details_control_type' => 'string',
+			'event_details_map_align'    => 'string',
+			'event_list_map_width'       => 'int',
+			'event_list_map_height'      => 'int',
+			'event_list_map_zoom'        => 'int',
+			'event_list_display_nav'     => 'int',
+			'event_list_nav_size'        => 'int',
+			'event_list_control_type'    => 'string',
+			'event_list_map_align'       => 'string',
+		];
+
+		foreach ($settings as $setting => $type) {
+			$map_settings->{$setting} = $this->request->getRequestParam($setting, $map_settings->{$setting}, $type);
+		}
+
+		EE_Registry::instance()->CFG->map_settings = apply_filters(
+			'FHEE__Extend_General_Settings_Admin_Page___update_google_map_settings__CFG_map_settings',
+			$map_settings
+		);
+
+		$what    = 'Google Map Settings';
+		$success = $this->_update_espresso_configuration(
+			$what,
+			EE_Registry::instance()->CFG->map_settings,
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		$this->_redirect_after_action($success, $what, 'updated', ['action' => 'google_map_settings']);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _venue_editor_metaboxes()
+	{
+		$this->verify_cpt_object();
+
+		$this->addMetaBox(
+			'espresso_venue_address_options',
+			esc_html__('Physical Location', 'event_espresso'),
+			[$this, 'venue_address_metabox'],
+			$this->page_slug,
+			'side'
+		);
+		$this->addMetaBox(
+			'espresso_venue_gmap_options',
+			esc_html__('Google Map', 'event_espresso'),
+			[$this, 'venue_gmap_metabox'],
+			$this->page_slug,
+			'side'
+		);
+		$this->addMetaBox(
+			'espresso_venue_virtual_loc_options',
+			esc_html__('Virtual Location', 'event_espresso'),
+			[$this, 'venue_virtual_loc_metabox'],
+			$this->page_slug,
+			'side'
+		);
+	}
+
+
+	public function venue_gmap_metabox()
+	{
+		$template_args = [
+			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input(
+				'vnu_enable_for_gmap',
+				$this->get_yes_no_values(),
+				$this->_cpt_model_obj instanceof EE_Venue ? $this->_cpt_model_obj->enable_for_gmap() : false
+			),
+			'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
+		];
+		$template      = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function venue_address_metabox()
+	{
+		$template_args['_venue'] = $this->_cpt_model_obj;
+
+		$template_args['states_dropdown']    = EEH_Form_Fields::generate_form_input(
+			new EE_Question_Form_Input(
+				EE_Question::new_instance(
+					['QST_display_text' => esc_html__('State', 'event_espresso'), 'QST_system' => 'state']
+				),
+				EE_Answer::new_instance(
+					[
+						'ANS_value' => $this->_cpt_model_obj instanceof EE_Venue
+							? $this->_cpt_model_obj->state_ID()
+							: 0,
+					]
+				),
+				[
+					'input_name'     => 'sta_id',
+					'input_id'       => 'sta_id',
+					'input_class'    => '',
+					'input_prefix'   => '',
+					'append_qstn_id' => false,
+				]
+			)
+		);
+		$template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
+			new EE_Question_Form_Input(
+				EE_Question::new_instance(
+					['QST_display_text' => esc_html__('Country', 'event_espresso'), 'QST_system' => 'country']
+				),
+				EE_Answer::new_instance(
+					[
+						'ANS_value' => $this->_cpt_model_obj instanceof EE_Venue
+							? $this->_cpt_model_obj->country_ID()
+							: 0,
+					]
+				),
+				[
+					'input_name'     => 'cnt_iso',
+					'input_id'       => 'cnt_iso',
+					'input_class'    => '',
+					'input_prefix'   => '',
+					'append_qstn_id' => false,
+				]
+			)
+		);
+
+		$template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
+
+
+	public function venue_virtual_loc_metabox()
+	{
+		$template_args = [
+			'_venue' => $this->_cpt_model_obj,
+		];
+		$template      = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
+
+
+	protected function _restore_cpt_item($post_id, $revision_id)
+	{
+		$venue_obj = $this->_venue_model->get_one_by_ID($post_id);
+
+		// meta revision restore
+		$venue_obj->restore_revision($revision_id);
+	}
+
+
+	/**
+	 * Handles updates for venue cpts
+	 *
+	 * @param int    $post_id ID of Venue CPT
+	 * @param WP_Post $post    Post object (with "blessed" WP properties)
+	 * @return void
+	 */
+	protected function _insert_update_cpt_item($post_id, $post)
+	{
+
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
+			return;// get out we're not processing the saving of venues.
+		}
+
+		$wheres = [$this->_venue_model->primary_key_name() => $post_id];
+
+		$venue_values = [
+			'VNU_address'         => $this->request->getRequestParam('vnu_address'),
+			'VNU_address2'        => $this->request->getRequestParam('vnu_address2'),
+			'VNU_city'            => $this->request->getRequestParam('vnu_city'),
+			'STA_ID'              => $this->request->getRequestParam('sta_id'),
+			'CNT_ISO'             => $this->request->getRequestParam('cnt_iso'),
+			'VNU_zip'             => $this->request->getRequestParam('vnu_zip'),
+			'VNU_phone'           => $this->request->getRequestParam('vnu_phone'),
+			'VNU_capacity'        => $this->request->requestParamIsSet('vnu_capacity')
+				? str_replace(',', '', $this->request->getRequestParam('vnu_capacity'))
+				: EE_INF,
+			'VNU_url'             => $this->request->getRequestParam('vnu_url'),
+			'VNU_virtual_phone'   => $this->request->getRequestParam('vnu_virtual_phone'),
+			'VNU_virtual_url'     => $this->request->getRequestParam('vnu_virtual_url'),
+			'VNU_enable_for_gmap' => $this->request->getRequestParam('vnu_enable_for_gmap', false, 'bool'),
+			'VNU_google_map_link' => $this->request->getRequestParam('vnu_google_map_link'),
+		];
+
+		// update venue
+		$success = $this->_venue_model->update($venue_values, [$wheres]);
+
+		// get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
+		$get_one_where = [$this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status];
+		$venue         = $this->_venue_model->get_one([$get_one_where]);
+
+		// notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
+		$venue_update_callbacks = apply_filters(
+			'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks',
+			[]
+		);
+		$att_success            = true;
+		foreach ($venue_update_callbacks as $v_callback) {
+			// if ANY of these updates fail then we want the appropriate global error message
+			$att_success = call_user_func_array($v_callback, [$venue, $this->request->requestParams()])
+				? $att_success
+				: false;
+		}
+
+		// any errors?
+		if ($success && ! $att_success) {
+			EE_Error::add_error(
+				esc_html__(
+					'Venue Details saved successfully but something went wrong with saving attachments.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		} elseif ($success === false) {
+			EE_Error::add_error(
+				esc_html__('Venue Details did not save successfully.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
+
+
+	/**
+	 * @param int $post_id
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function trash_cpt_item($post_id)
+	{
+		$this->request->setRequestParam('VNU_ID', $post_id);
+		$this->_trash_or_restore_venue('trash', false);
+	}
+
+
+	/**
+	 * @param int $post_id
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function restore_cpt_item($post_id)
+	{
+		$this->request->setRequestParam('VNU_ID', $post_id);
+		$this->_trash_or_restore_venue('draft', false);
+	}
+
+
+	/**
+	 * @param int $post_id
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function delete_cpt_item($post_id)
+	{
+		$this->request->setRequestParam('VNU_ID', $post_id);
+		$this->_delete_venue(false);
+	}
+
+
+	public function get_venue_object()
+	{
+		return $this->_cpt_model_obj;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _trash_or_restore_venue($venue_status = 'trash', $redirect_after = true)
+	{
+		$VNU_ID = $this->request->getRequestParam('VNU_ID', 0, 'int');
+
+		// loop thru venues
+		if ($VNU_ID) {
+			// clean status
+			$venue_status = sanitize_key($venue_status);
+			// grab status
+			if (! empty($venue_status)) {
+				$success = $this->_change_venue_status($VNU_ID, $venue_status);
+			} else {
+				$success = false;
+				$msg     = esc_html__(
+					'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
+					'event_espresso'
+				);
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			}
+		} else {
+			$success = false;
+			$msg     = esc_html__(
+				'An error occurred. The venue could not be moved to the trash because a valid venue ID was not not supplied.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
+
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Venue', $action, ['action' => 'default']);
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _trash_or_restore_venues($venue_status = 'trash')
+	{
+		// clean status
+		$venue_status = sanitize_key($venue_status);
+		// grab status
+		if (! empty($venue_status)) {
+			$success = true;
+			// determine the event id and set to array.
+			$VNU_IDs = $this->request->getRequestParam('venue_id', [], 'int', true);
+			// loop thru events
+			foreach ($VNU_IDs as $VNU_ID) {
+				if ($VNU_ID = absint($VNU_ID)) {
+					$results = $this->_change_venue_status($VNU_ID, $venue_status);
+					$success = $results !== false ? $success : false;
+				} else {
+					$msg = sprintf(
+						esc_html__(
+							'An error occurred. Venue #%d could not be moved to the trash because a valid venue ID was not not supplied.',
+							'event_espresso'
+						),
+						$VNU_ID
+					);
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+					$success = false;
+				}
+			}
+		} else {
+			$success = false;
+			$msg     = esc_html__(
+				'An error occurred. The venue could not be moved to the trash because a valid venue status was not not supplied.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		// in order to force a pluralized result message we need to send back a success status greater than 1
+		$success = $success ? 2 : false;
+		$action  = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
+		$this->_redirect_after_action($success, 'Venues', $action, ['action' => 'default']);
+	}
+
+
+	/**
+	 * _trash_or_restore_venues
+	 *
+	 * //todo this is pretty much the same as the corresponding change_event_status method in Events_Admin_Page.  We
+	 * should probably abstract this up to the EE_Admin_Page_CPT (or even EE_Admin_Page) and make this a common method
+	 * accepting a certain number of params.
+	 *
+	 * @access  private
+	 * @param int    $VNU_ID
+	 * @param string $venue_status
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _change_venue_status($VNU_ID = 0, $venue_status = '')
+	{
+		// grab venue id
+		if (! $VNU_ID) {
+			$msg = esc_html__('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+		$this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+
+		// clean status
+		$venue_status = sanitize_key($venue_status);
+		// grab status
+		if (! $venue_status) {
+			$msg = esc_html__(
+				'An error occurred. No Venue Status or an invalid Venue Status was received.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+		// was event trashed or restored ?
+		switch ($venue_status) {
+			case 'draft':
+				$action = 'restored from the trash';
+				$hook   = 'AHEE_venue_restored_from_trash';
+				break;
+			case 'trash':
+				$action = 'moved to the trash';
+				$hook   = 'AHEE_venue_moved_to_trash';
+				break;
+			default:
+				$action = 'updated';
+				$hook   = false;
+		}
+		// use class to change status
+		$this->_cpt_model_obj->set_status($venue_status);
+		$success = $this->_cpt_model_obj->save();
+
+		if ($success === false) {
+			$msg = sprintf(esc_html__('An error occurred. The venue could not be %s.', 'event_espresso'), $action);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		if ($hook) {
+			do_action($hook);
+		}
+		return true;
+	}
+
+
+	/**
+	 * @param bool $redirect_after
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _delete_venue($redirect_after = true)
+	{
+		// determine the venue id and set to array.
+		$VNU_ID = $this->request->getRequestParam('VNU_ID', 0, 'int');
+		$VNU_ID = $this->request->getRequestParam('post', $VNU_ID, 'int');
+
+		// loop thru venues
+		if ($VNU_ID) {
+			$success = $this->_delete_or_trash_venue($VNU_ID);
+		} else {
+			$success = false;
+			$msg     = esc_html__(
+				'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Venue', 'deleted', ['action' => 'default']);
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _delete_venues()
+	{
+		$success = true;
+		// determine the event id and set to array.
+		$VNU_IDs = $this->request->getRequestParam('venue_id', [], 'int', true);
+		// loop thru events
+		foreach ($VNU_IDs as $VNU_ID) {
+			if ($VNU_ID = absint($VNU_ID)) {
+				$results = $this->_delete_or_trash_venue($VNU_ID);
+				$success = $results !== false ? $success : false;
+			} else {
+				$success = false;
+				$msg     = esc_html__(
+					'An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.',
+					'event_espresso'
+				);
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			}
+		}
+		// in order to force a pluralized result message we need to send back a success status greater than 1
+		$success = $success ? 2 : false;
+		$this->_redirect_after_action(
+			$success,
+			esc_html__('Venues', 'event_espresso'),
+			esc_html__('deleted', 'event_espresso'),
+			['action' => 'default']
+		);
+	}
+
+
+	// todo: put in parent
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _delete_or_trash_venue($VNU_ID = false)
+	{
+		// grab event id
+		if (! $VNU_ID = absint($VNU_ID)) {
+			$msg = esc_html__('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+
+		$venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+		// first need to remove all term relationships
+		$venue->_remove_relations('Term_Taxonomy');
+		$success = $venue->delete_permanently();
+		// did it all go as planned ?
+		if ($success) {
+			$msg = sprintf(esc_html__('Venue ID # %d has been deleted.', 'event_espresso'), $VNU_ID);
+			EE_Error::add_success($msg);
+		} else {
+			$msg =
+				sprintf(
+					esc_html__('An error occurred. Venue ID # %d could not be deleted.', 'event_espresso'),
+					$VNU_ID
+				);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
+		return true;
+	}
+
+
+
+
+	/***********/
+	/* QUERIES */
+
+
+	public function get_venues($per_page = 10, $count = false)
+	{
+
+		$orderby = $this->request->getRequestParam('orderby', '');
+
+		switch ($orderby) {
+			case 'id':
+				$orderby = 'VNU_ID';
+				break;
+
+			case 'capacity':
+				$orderby = 'VNU_capacity';
+				break;
+
+			case 'city':
+				$orderby = 'VNU_city';
+				break;
+
+			default:
+				$orderby = 'VNU_name';
+		}
+
+		$sort         = $this->request->getRequestParam('order', 'ASC');
+		$current_page = $this->request->getRequestParam('paged', 1, 'int');
+		$per_page     = ! empty($per_page) ? $per_page : 10;
+		$per_page     = $this->request->getRequestParam('perpage', $per_page, 'int');
+
+		$offset = ($current_page - 1) * $per_page;
+		$limit  = [$offset, $per_page];
+
+		$category = $this->request->getRequestParam('category');
+		$category = $category > 0 ? $category : null;
+
+		$where = [];
+
+		// only set initial status if it is in the incoming request.  Otherwise the "all" view display's all statuses.
+		$status = $this->request->getRequestParam('status');
+		if ($status && $status !== 'all') {
+			$where['status'] = $status;
+		}
+
+		$venue_status = $this->request->getRequestParam('venue_status');
+		if ($venue_status) {
+			$where['status'] = $venue_status;
+		}
+
+
+		if ($category) {
+			$where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
+			$where['Term_Taxonomy.term_id']  = $category;
+		}
+
+
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$where['VNU_wp_user'] = get_current_user_id();
+		} else {
+			if (! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
+				$where['OR'] = [
+					'status*restrict_private' => ['!=', 'private'],
+					'AND'                     => [
+						'status*inclusive' => ['=', 'private'],
+						'VNU_wp_user'      => get_current_user_id(),
+					],
+				];
+			}
+		}
+
+		$search_term = $this->request->getRequestParam('s');
+		if ($search_term) {
+			$search_term = '%' . $search_term . '%';
+			$where['OR'] = [
+				'VNU_name'               => ['LIKE', $search_term],
+				'VNU_desc'               => ['LIKE', $search_term],
+				'VNU_short_desc'         => ['LIKE', $search_term],
+				'VNU_address'            => ['LIKE', $search_term],
+				'VNU_address2'           => ['LIKE', $search_term],
+				'VNU_city'               => ['LIKE', $search_term],
+				'VNU_zip'                => ['LIKE', $search_term],
+				'VNU_phone'              => ['LIKE', $search_term],
+				'VNU_url'                => ['LIKE', $search_term],
+				'VNU_virtual_phone'      => ['LIKE', $search_term],
+				'VNU_virtual_url'        => ['LIKE', $search_term],
+				'VNU_google_map_link'    => ['LIKE', $search_term],
+				'Event.EVT_name'         => ['LIKE', $search_term],
+				'Event.EVT_desc'         => ['LIKE', $search_term],
+				'Event.EVT_phone'        => ['LIKE', $search_term],
+				'Event.EVT_external_URL' => ['LIKE', $search_term],
+			];
+		}
+
+
+		return $count
+			? $this->_venue_model->count([$where], 'VNU_ID')
+			: $this->_venue_model->get_all(
+				[$where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort]
+			);
+	}
+
+
+
+
+	/** Venue Category Stuff **/
+
+	/**
+	 * set the _category property with the category object for the loaded page.
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _set_category_object()
+	{
+		if (isset($this->_category->id) && ! empty($this->_category->id)) {
+			return;
+		} // already have the category object so get out.
+
+		// set default category object
+		$this->_set_empty_category_object();
+
+		// only set if we've got an id
+		$category_ID = $this->request->getRequestParam('VEN_CAT_ID', 0, 'int');
+		if (! $category_ID) {
+			return;
+		}
+
+		$term = get_term($category_ID, 'espresso_venue_categories');
+
+
+		if (! empty($term)) {
+			$this->_category->category_name       = $term->name;
+			$this->_category->category_identifier = $term->slug;
+			$this->_category->category_desc       = $term->description;
+			$this->_category->id                  = $term->term_id;
+			$this->_category->parent              = $term->parent;
+		}
+	}
+
+
+	private function _set_empty_category_object()
+	{
+		$this->_category                = new stdClass();
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
+		$this->_category->id            = $this->_category->parent = 0;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _category_list_table()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+			'add_category',
+			'add_category',
+			[],
+			'add-new-h2'
+		);
+		$this->_search_btn_label = esc_html__('Venue Categories', 'event_espresso');
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _category_details($view)
+	{
+
+		// load formatter helper
+		// load field generator helper
+
+		$route = $view == 'edit' ? 'update_category' : 'insert_category';
+		$this->_set_add_edit_form_tags($route);
+
+		$this->_set_category_object();
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
+
+		$delete_action = 'delete_category';
+
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(['action' => 'category_list'], $this->_admin_base_url);
+
+		$this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
+
+		// take care of contents
+		$this->_template_args['admin_page_content'] = $this->_category_details_content();
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _category_details_content()
+	{
+		$editor_args['category_desc'] = [
+			'type'          => 'wp_editor',
+			'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
+			'class'         => 'my_editor_custom',
+			'wpeditor_args' => ['media_buttons' => false],
+		];
+		$_wp_editor                   = $this->_generate_admin_form_fields($editor_args, 'array');
+
+		$all_terms = get_terms(
+			['espresso_venue_categories'],
+			['hide_empty' => 0, 'exclude' => [$this->_category->id]]
+		);
+
+		// setup category select for term parents.
+		$category_select_values[] = [
+			'text' => esc_html__('No Parent', 'event_espresso'),
+			'id'   => 0,
+		];
+		foreach ($all_terms as $term) {
+			$category_select_values[] = [
+				'text' => $term->name,
+				'id'   => $term->term_id,
+			];
+		}
+
+		$category_select = EEH_Form_Fields::select_input(
+			'category_parent',
+			$category_select_values,
+			$this->_category->parent
+		);
+		$template_args   = [
+			'category'                 => $this->_category,
+			'category_select'          => $category_select,
+			'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
+			'category_desc_editor'     => $_wp_editor['category_desc']['field'],
+			'disable'                  => '',
+			'disabled_message'         => false,
+		];
+		$template        = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, true);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _delete_categories()
+	{
+		$category_ID  = $this->request->getRequestParam('category_id', 0, 'int');
+		$category_IDs = $this->request->getRequestParam('VEN_CAT_ID', [$category_ID], 'int', true);
+
+		foreach ($category_IDs as $cat_id) {
+			$this->_delete_category($cat_id);
+		}
+
+		// doesn't matter what page we're coming from... we're going to the same place after delete.
+		$query_args = [
+			'action' => 'category_list',
+		];
+		$this->_redirect_after_action(0, '', '', $query_args);
+	}
+
+
+	protected function _delete_category($cat_id)
+	{
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_venue_categories');
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _insert_or_update_category($new_category)
+	{
+
+		$cat_id  = $new_category ? $this->_insert_category() : $this->_insert_category(true);
+		$success = 0; // we already have a success message so lets not send another.
+		if ($cat_id) {
+			$query_args = [
+				'action'     => 'edit_category',
+				'VEN_CAT_ID' => $cat_id,
+			];
+		} else {
+			$query_args = ['action' => 'add_category'];
+		}
+		$this->_redirect_after_action($success, '', '', $query_args, true);
+	}
+
+
+	private function _insert_category($update = false)
+	{
+		$category_ID     = $update ? $this->request->getRequestParam('VEN_CAT_ID', '', 'int') : '';
+		$category_name   = $this->request->getRequestParam('category_name', '');
+		$category_desc   = $this->request->getRequestParam('category_desc', '', 'html');
+		$category_parent = $this->request->getRequestParam('category_parent', 0, 'int');
+
+		if (empty($category_name)) {
+			$msg = esc_html__('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+
+
+		$term_args = [
+			'name'        => $category_name,
+			'description' => $category_desc,
+			'parent'      => $category_parent,
+		];
+
+		$insert_ids = $update
+			? wp_update_term($category_ID, 'espresso_venue_categories', $term_args)
+			: wp_insert_term(
+				$category_name,
+				'espresso_venue_categories',
+				$term_args
+			);
+
+		if (! is_array($insert_ids)) {
+			EE_Error::add_error(
+				esc_html__('An error occurred and the category has not been saved to the database.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		} else {
+			$category_ID = $insert_ids['term_id'];
+			EE_Error::add_success(
+				sprintf(
+					esc_html__('The category %s was successfully created', 'event_espresso'),
+					$category_name
+				)
+			);
+		}
+
+		return $category_ID;
+	}
+
+
+	/**
+	 * TODO handle category exports()
+	 *
+	 * @return void
+	 */
+	protected function _categories_export()
+	{
+		// todo: I don't like doing this but it'll do until we modify EE_Export Class.
+		$this->request->mergeRequestParams(
+			[
+				'export'       => 'report',
+				'action'       => 'categories',
+				'category_ids' => $this->request->getRequestParam('VEN_CAT_ID', 0, 'int'),
+			]
+		);
+
+		if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
+			require_once(EE_CLASSES . 'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->request->requestParams());
+			$EE_Export->export();
+		}
+	}
+
+
+	protected function _import_categories()
+	{
+
+		require_once(EE_CLASSES . 'EE_Import.class.php');
+		EE_Import::instance()->import();
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	public function get_categories($per_page = 10, $current_page = 1, $count = false)
+	{
+
+		// testing term stuff
+		$orderby     = $this->request->getRequestParam('orderby', 'Term.term_id');
+		$order       = $this->request->getRequestParam('order', 'DESC');
+		$limit       = ($current_page - 1) * $per_page;
+		$where       = ['taxonomy' => 'espresso_venue_categories'];
+		$search_term = $this->request->getRequestParam('s');
+		if ($search_term) {
+			$search_term = '%' . $search_term . '%';
+			$where['OR'] = [
+				'Term.name'   => ['LIKE', $search_term],
+				'description' => ['LIKE', $search_term],
+			];
+		}
+
+		$query_params = [
+			$where,
+			'order_by'   => [$orderby => $order],
+			'limit'      => $limit . ',' . $per_page,
+			'force_join' => ['Term'],
+		];
+
+		return $count
+			? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
+			: EEM_Term_Taxonomy::instance()->get_all($query_params);
+	}
+
+
+	/* end category stuff */
+	/**************/
 }

admin_pages/general_settings/OrganizationSettings.php

Indentation +508 added lines, -508 removed lines

@@ -43,534 +43,534 @@
  */
 class OrganizationSettings extends FormHandler
 {
-    /**
-     * @var EE_Organization_Config
-     */
-    protected $organization_config;
+	/**
+	 * @var EE_Organization_Config
+	 */
+	protected $organization_config;
 
-    /**
-     * @var EE_Core_Config
-     */
-    protected $core_config;
+	/**
+	 * @var EE_Core_Config
+	 */
+	protected $core_config;
 
 
-    /**
-     * @var EE_Network_Core_Config
-     */
-    protected $network_core_config;
+	/**
+	 * @var EE_Network_Core_Config
+	 */
+	protected $network_core_config;
 
-    /**
-     * @var CountrySubRegionDao $countrySubRegionDao
-     */
-    protected $countrySubRegionDao;
+	/**
+	 * @var CountrySubRegionDao $countrySubRegionDao
+	 */
+	protected $countrySubRegionDao;
 
 
-    /**
-     * Form constructor.
-     *
-     * @param EE_Registry            $registry
-     * @param EE_Organization_Config $organization_config
-     * @param EE_Core_Config         $core_config
-     * @param EE_Network_Core_Config $network_core_config
-     * @param CountrySubRegionDao    $countrySubRegionDao
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function __construct(
-        EE_Registry $registry,
-        EE_Organization_Config $organization_config,
-        EE_Core_Config $core_config,
-        EE_Network_Core_Config $network_core_config,
-        CountrySubRegionDao $countrySubRegionDao
-    ) {
-        $this->organization_config = $organization_config;
-        $this->core_config         = $core_config;
-        $this->network_core_config = $network_core_config;
-        $this->countrySubRegionDao = $countrySubRegionDao;
-        parent::__construct(
-            esc_html__('Your Organization Settings', 'event_espresso'),
-            esc_html__('Your Organization Settings', 'event_espresso'),
-            'organization_settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
+	/**
+	 * Form constructor.
+	 *
+	 * @param EE_Registry            $registry
+	 * @param EE_Organization_Config $organization_config
+	 * @param EE_Core_Config         $core_config
+	 * @param EE_Network_Core_Config $network_core_config
+	 * @param CountrySubRegionDao    $countrySubRegionDao
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function __construct(
+		EE_Registry $registry,
+		EE_Organization_Config $organization_config,
+		EE_Core_Config $core_config,
+		EE_Network_Core_Config $network_core_config,
+		CountrySubRegionDao $countrySubRegionDao
+	) {
+		$this->organization_config = $organization_config;
+		$this->core_config         = $core_config;
+		$this->network_core_config = $network_core_config;
+		$this->countrySubRegionDao = $countrySubRegionDao;
+		parent::__construct(
+			esc_html__('Your Organization Settings', 'event_espresso'),
+			esc_html__('Your Organization Settings', 'event_espresso'),
+			'organization_settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function generate()
-    {
-        $has_sub_regions = EEM_State::instance()->count(
-            [['Country.CNT_ISO' => $this->organization_config->CNT_ISO]]
-        );
-        $form            = new EE_Form_Section_Proper(
-            [
-                'name'            => 'organization_settings',
-                'html_id'         => 'organization_settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => [
-                    'contact_information_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Contact Information', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(EEH_Template::get_help_tab_link('contact_info_info')),
-                            '',
-                            'contact-information-hdr'
-                        )
-                    ),
-                    'organization_name'       => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_name',
-                            'html_label_text' => esc_html__('Organization Name', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'Displayed on all emails and invoices.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('name'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_address_1'  => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_address_1',
-                            'html_label_text' => esc_html__('Street Address', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('address_1'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_address_2'  => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_address_2',
-                            'html_label_text' => esc_html__('Street Address 2', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('address_2'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_city'       => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_city',
-                            'html_class'      => 'ee-input-size--reg',
-                            'html_label_text' => esc_html__('City', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('city'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_country'    => new EE_Country_Select_Input(
-                        null,
-                        [
-                            EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
-                            'html_name'                             => 'organization_country',
-                            'html_class'                            => 'ee-input-size--reg',
-                            'html_label_text'                       => esc_html__('Country', 'event_espresso'),
-                            'default'                               => $this->organization_config->CNT_ISO,
-                            'required'                              => false,
-                            'html_help_text'                        => sprintf(
-                                esc_html__(
-                                    '%1$sThe Country set here will have the effect of setting the currency used for all ticket prices.%2$s',
-                                    'event_espresso'
-                                ),
-                                '<span class="reminder-spn">',
-                                '</span>'
-                            ),
-                        ]
-                    ),
-                    'organization_state'      => new EE_State_Select_Input(
-                        null,
-                        [
-                            'html_name'       => 'organization_state',
-                            'html_label_text' => esc_html__('State/Province', 'event_espresso'),
-                            'default'         => $this->organization_config->STA_ID,
-                            'required'        => false,
-                            'html_help_text'  => empty($this->organization_config->STA_ID) || ! $has_sub_regions
-                                ? sprintf(
-                                    esc_html__(
-                                        'If the States/Provinces for the selected Country do not appear in this list, then click "Save".%3$sIf data exists, then the list will be populated when the page reloads and you will be able to make a selection at that time.%3$s%1$sMake sure you click "Save" again after selecting a State/Province that has just been loaded in order to keep that selection.%2$s',
-                                        'event_espresso'
-                                    ),
-                                    '<span class="reminder-spn">',
-                                    '</span>',
-                                    '<br />'
-                                )
-                                : '',
-                        ]
-                    ),
-                    'organization_zip'        => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_zip',
-                            'html_class'      => 'ee-input-size--small',
-                            'html_label_text' => esc_html__('Zip/Postal Code', 'event_espresso'),
-                            'default'         => $this->organization_config->get_pretty('zip'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_email'      => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_email',
-                            'html_label_text' => esc_html__('Primary Contact Email', 'event_espresso'),
-                            'html_help_text'  => sprintf(
-                                esc_html__(
-                                    'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
-                                    'event_espresso'
-                                ),
-                                '<code>[CO_FORMATTED_EMAIL]</code>',
-                                '<code>[CO_EMAIL]</code>'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('email'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_phone'      => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_phone',
-                            'html_class'      => 'ee-input-size--small',
-                            'html_label_text' => esc_html__('Phone Number', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'The phone number for your organization.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('phone'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'organization_vat'        => new EE_Text_Input(
-                        [
-                            'html_name'       => 'organization_vat',
-                            'html_class'      => 'ee-input-size--reg',
-                            'html_label_text' => esc_html__('VAT/Tax Number', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'The VAT/Tax Number may be displayed on invoices and receipts.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('vat'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'company_logo_hdr'        => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Company Logo', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(EEH_Template::get_help_tab_link('organization_logo_info')),
-                            '',
-                            'company-logo-hdr'
-                        )
-                    ),
-                    'organization_logo_url'   => new EE_Admin_File_Uploader_Input(
-                        [
-                            'html_name'       => 'organization_logo_url',
-                            'html_label_text' => esc_html__('Upload New Logo', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
-                                'event_espresso'
-                            ),
-                            'default'         => $this->organization_config->get_pretty('logo_url'),
-                            'required'        => false,
-                        ]
-                    ),
-                    'social_links_hdr'        => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Social Links', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(EEH_Template::get_help_tab_link('social_links_info'))
-                            . EEH_HTML::br()
-                            . EEH_HTML::p(
-                                esc_html__(
-                                    'Enter any links to social accounts for your organization here',
-                                    'event_espresso'
-                                ),
-                                '',
-                                'description'
-                            ),
-                            '',
-                            'social-links-hdr'
-                        )
-                    ),
-                    'organization_facebook'   => new EE_Text_Input(
-                        [
-                            'html_name'             => 'organization_facebook',
-                            'html_label_text'       => esc_html__('Facebook', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="facebook.com/profile.name"',
-                            'default'               => $this->organization_config->get_pretty('facebook'),
-                            'required'              => false,
-                        ]
-                    ),
-                    'organization_twitter'    => new EE_Text_Input(
-                        [
-                            'html_name'             => 'organization_twitter',
-                            'html_label_text'       => esc_html__('Twitter', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="twitter.com/twitterhandle"',
-                            'default'               => $this->organization_config->get_pretty('twitter'),
-                            'required'              => false,
-                        ]
-                    ),
-                    'organization_linkedin'   => new EE_Text_Input(
-                        [
-                            'html_name'             => 'organization_linkedin',
-                            'html_label_text'       => esc_html__('LinkedIn', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="linkedin.com/in/profilename"',
-                            'default'               => $this->organization_config->get_pretty('linkedin'),
-                            'required'              => false,
-                        ]
-                    ),
-                    'organization_pinterest'  => new EE_Text_Input(
-                        [
-                            'html_name'             => 'organization_pinterest',
-                            'html_label_text'       => esc_html__('Pinterest', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="pinterest.com/profilename"',
-                            'default'               => $this->organization_config->get_pretty('pinterest'),
-                            'required'              => false,
-                        ]
-                    ),
-                    'organization_instagram'  => new EE_Text_Input(
-                        [
-                            'html_name'             => 'organization_instagram',
-                            'html_label_text'       => esc_html__('Instagram', 'event_espresso'),
-                            'other_html_attributes' => ' placeholder="instagram.com/handle"',
-                            'default'               => $this->organization_config->get_pretty('instagram'),
-                            'required'              => false,
-                        ]
-                    ),
-                ],
-            ]
-        );
-        if (is_main_site()) {
-            $form->add_subsections(
-                [
-                    'site_license_key_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Your Event Espresso License Key', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('site_license_key_info')
-                            ),
-                            '',
-                            'site-license-key-hdr'
-                        )
-                    ),
-                    'site_license_key'     => $this->getSiteLicenseKeyField(),
-                ]
-            );
-            $form->add_subsections(
-                [
-                    'uxip_optin_hdr' => new EE_Form_Section_HTML(
-                        $this->uxipOptinText()
-                    ),
-                    'ueip_optin'     => new EE_Checkbox_Multi_Input(
-                        [
-                            true => esc_html__('Yes! I want to help improve Event Espresso!', 'event_espresso'),
-                        ],
-                        [
-                            'html_name'       => EE_Core_Config::OPTION_NAME_UXIP,
-                            'html_label_text' => esc_html__(
-                                'UXIP Opt In?',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->core_config->ee_ueip_optin)
-                                ? filter_var($this->core_config->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN)
-                                : false,
-                            'required'        => false,
-                        ]
-                    ),
-                ],
-                'organization_instagram',
-                false
-            );
-        }
-        return $form;
-    }
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function generate()
+	{
+		$has_sub_regions = EEM_State::instance()->count(
+			[['Country.CNT_ISO' => $this->organization_config->CNT_ISO]]
+		);
+		$form            = new EE_Form_Section_Proper(
+			[
+				'name'            => 'organization_settings',
+				'html_id'         => 'organization_settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => [
+					'contact_information_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Contact Information', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(EEH_Template::get_help_tab_link('contact_info_info')),
+							'',
+							'contact-information-hdr'
+						)
+					),
+					'organization_name'       => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_name',
+							'html_label_text' => esc_html__('Organization Name', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'Displayed on all emails and invoices.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('name'),
+							'required'        => false,
+						]
+					),
+					'organization_address_1'  => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_address_1',
+							'html_label_text' => esc_html__('Street Address', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('address_1'),
+							'required'        => false,
+						]
+					),
+					'organization_address_2'  => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_address_2',
+							'html_label_text' => esc_html__('Street Address 2', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('address_2'),
+							'required'        => false,
+						]
+					),
+					'organization_city'       => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_city',
+							'html_class'      => 'ee-input-size--reg',
+							'html_label_text' => esc_html__('City', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('city'),
+							'required'        => false,
+						]
+					),
+					'organization_country'    => new EE_Country_Select_Input(
+						null,
+						[
+							EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
+							'html_name'                             => 'organization_country',
+							'html_class'                            => 'ee-input-size--reg',
+							'html_label_text'                       => esc_html__('Country', 'event_espresso'),
+							'default'                               => $this->organization_config->CNT_ISO,
+							'required'                              => false,
+							'html_help_text'                        => sprintf(
+								esc_html__(
+									'%1$sThe Country set here will have the effect of setting the currency used for all ticket prices.%2$s',
+									'event_espresso'
+								),
+								'<span class="reminder-spn">',
+								'</span>'
+							),
+						]
+					),
+					'organization_state'      => new EE_State_Select_Input(
+						null,
+						[
+							'html_name'       => 'organization_state',
+							'html_label_text' => esc_html__('State/Province', 'event_espresso'),
+							'default'         => $this->organization_config->STA_ID,
+							'required'        => false,
+							'html_help_text'  => empty($this->organization_config->STA_ID) || ! $has_sub_regions
+								? sprintf(
+									esc_html__(
+										'If the States/Provinces for the selected Country do not appear in this list, then click "Save".%3$sIf data exists, then the list will be populated when the page reloads and you will be able to make a selection at that time.%3$s%1$sMake sure you click "Save" again after selecting a State/Province that has just been loaded in order to keep that selection.%2$s',
+										'event_espresso'
+									),
+									'<span class="reminder-spn">',
+									'</span>',
+									'<br />'
+								)
+								: '',
+						]
+					),
+					'organization_zip'        => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_zip',
+							'html_class'      => 'ee-input-size--small',
+							'html_label_text' => esc_html__('Zip/Postal Code', 'event_espresso'),
+							'default'         => $this->organization_config->get_pretty('zip'),
+							'required'        => false,
+						]
+					),
+					'organization_email'      => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_email',
+							'html_label_text' => esc_html__('Primary Contact Email', 'event_espresso'),
+							'html_help_text'  => sprintf(
+								esc_html__(
+									'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
+									'event_espresso'
+								),
+								'<code>[CO_FORMATTED_EMAIL]</code>',
+								'<code>[CO_EMAIL]</code>'
+							),
+							'default'         => $this->organization_config->get_pretty('email'),
+							'required'        => false,
+						]
+					),
+					'organization_phone'      => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_phone',
+							'html_class'      => 'ee-input-size--small',
+							'html_label_text' => esc_html__('Phone Number', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'The phone number for your organization.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('phone'),
+							'required'        => false,
+						]
+					),
+					'organization_vat'        => new EE_Text_Input(
+						[
+							'html_name'       => 'organization_vat',
+							'html_class'      => 'ee-input-size--reg',
+							'html_label_text' => esc_html__('VAT/Tax Number', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'The VAT/Tax Number may be displayed on invoices and receipts.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('vat'),
+							'required'        => false,
+						]
+					),
+					'company_logo_hdr'        => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Company Logo', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(EEH_Template::get_help_tab_link('organization_logo_info')),
+							'',
+							'company-logo-hdr'
+						)
+					),
+					'organization_logo_url'   => new EE_Admin_File_Uploader_Input(
+						[
+							'html_name'       => 'organization_logo_url',
+							'html_label_text' => esc_html__('Upload New Logo', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
+								'event_espresso'
+							),
+							'default'         => $this->organization_config->get_pretty('logo_url'),
+							'required'        => false,
+						]
+					),
+					'social_links_hdr'        => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Social Links', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(EEH_Template::get_help_tab_link('social_links_info'))
+							. EEH_HTML::br()
+							. EEH_HTML::p(
+								esc_html__(
+									'Enter any links to social accounts for your organization here',
+									'event_espresso'
+								),
+								'',
+								'description'
+							),
+							'',
+							'social-links-hdr'
+						)
+					),
+					'organization_facebook'   => new EE_Text_Input(
+						[
+							'html_name'             => 'organization_facebook',
+							'html_label_text'       => esc_html__('Facebook', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="facebook.com/profile.name"',
+							'default'               => $this->organization_config->get_pretty('facebook'),
+							'required'              => false,
+						]
+					),
+					'organization_twitter'    => new EE_Text_Input(
+						[
+							'html_name'             => 'organization_twitter',
+							'html_label_text'       => esc_html__('Twitter', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="twitter.com/twitterhandle"',
+							'default'               => $this->organization_config->get_pretty('twitter'),
+							'required'              => false,
+						]
+					),
+					'organization_linkedin'   => new EE_Text_Input(
+						[
+							'html_name'             => 'organization_linkedin',
+							'html_label_text'       => esc_html__('LinkedIn', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="linkedin.com/in/profilename"',
+							'default'               => $this->organization_config->get_pretty('linkedin'),
+							'required'              => false,
+						]
+					),
+					'organization_pinterest'  => new EE_Text_Input(
+						[
+							'html_name'             => 'organization_pinterest',
+							'html_label_text'       => esc_html__('Pinterest', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="pinterest.com/profilename"',
+							'default'               => $this->organization_config->get_pretty('pinterest'),
+							'required'              => false,
+						]
+					),
+					'organization_instagram'  => new EE_Text_Input(
+						[
+							'html_name'             => 'organization_instagram',
+							'html_label_text'       => esc_html__('Instagram', 'event_espresso'),
+							'other_html_attributes' => ' placeholder="instagram.com/handle"',
+							'default'               => $this->organization_config->get_pretty('instagram'),
+							'required'              => false,
+						]
+					),
+				],
+			]
+		);
+		if (is_main_site()) {
+			$form->add_subsections(
+				[
+					'site_license_key_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Your Event Espresso License Key', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('site_license_key_info')
+							),
+							'',
+							'site-license-key-hdr'
+						)
+					),
+					'site_license_key'     => $this->getSiteLicenseKeyField(),
+				]
+			);
+			$form->add_subsections(
+				[
+					'uxip_optin_hdr' => new EE_Form_Section_HTML(
+						$this->uxipOptinText()
+					),
+					'ueip_optin'     => new EE_Checkbox_Multi_Input(
+						[
+							true => esc_html__('Yes! I want to help improve Event Espresso!', 'event_espresso'),
+						],
+						[
+							'html_name'       => EE_Core_Config::OPTION_NAME_UXIP,
+							'html_label_text' => esc_html__(
+								'UXIP Opt In?',
+								'event_espresso'
+							),
+							'default'         => isset($this->core_config->ee_ueip_optin)
+								? filter_var($this->core_config->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN)
+								: false,
+							'required'        => false,
+						]
+					),
+				],
+				'organization_instagram',
+				false
+			);
+		}
+		return $form;
+	}
 
 
-    /**
-     * takes the generated form and displays it along with ony other non-form HTML that may be required
-     * returns a string of HTML that can be directly echoed in a template
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws LogicException
-     */
-    public function display()
-    {
-        $this->form()->enqueue_js();
-        return parent::display();
-    }
+	/**
+	 * takes the generated form and displays it along with ony other non-form HTML that may be required
+	 * returns a string of HTML that can be directly echoed in a template
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws LogicException
+	 */
+	public function display()
+	{
+		$this->form()->enqueue_js();
+		return parent::display();
+	}
 
 
-    /**
-     * handles processing the form submission
-     * returns true or false depending on whether the form was processed successfully or not
-     *
-     * @param array $form_data
-     * @return bool
-     * @throws InvalidFormSubmissionException
-     * @throws EE_Error
-     * @throws LogicException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function process($form_data = [])
-    {
-        // process form
-        $valid_data = (array) parent::process($form_data);
-        if (empty($valid_data)) {
-            return false;
-        }
+	/**
+	 * handles processing the form submission
+	 * returns true or false depending on whether the form was processed successfully or not
+	 *
+	 * @param array $form_data
+	 * @return bool
+	 * @throws InvalidFormSubmissionException
+	 * @throws EE_Error
+	 * @throws LogicException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function process($form_data = [])
+	{
+		// process form
+		$valid_data = (array) parent::process($form_data);
+		if (empty($valid_data)) {
+			return false;
+		}
 
-        if (is_main_site()) {
-            $this->network_core_config->site_license_key = isset($form_data['ee_site_license_key'])
-                ? sanitize_text_field($form_data['ee_site_license_key'])
-                : $this->network_core_config->site_license_key;
-        }
-        $this->organization_config->name         = isset($form_data['organization_name'])
-            ? sanitize_text_field($form_data['organization_name'])
-            : $this->organization_config->name;
-        $this->organization_config->address_1    = isset($form_data['organization_address_1'])
-            ? sanitize_text_field($form_data['organization_address_1'])
-            : $this->organization_config->address_1;
-        $this->organization_config->address_2    = isset($form_data['organization_address_2'])
-            ? sanitize_text_field($form_data['organization_address_2'])
-            : $this->organization_config->address_2;
-        $this->organization_config->city         = isset($form_data['organization_city'])
-            ? sanitize_text_field($form_data['organization_city'])
-            : $this->organization_config->city;
-        $this->organization_config->STA_ID       = isset($form_data['organization_state'])
-            ? absint($form_data['organization_state'])
-            : $this->organization_config->STA_ID;
-        $this->organization_config->CNT_ISO      = isset($form_data['organization_country'])
-            ? sanitize_text_field($form_data['organization_country'])
-            : $this->organization_config->CNT_ISO;
-        $this->organization_config->zip          = isset($form_data['organization_zip'])
-            ? sanitize_text_field($form_data['organization_zip'])
-            : $this->organization_config->zip;
-        $this->organization_config->email        = isset($form_data['organization_email'])
-            ? sanitize_email($form_data['organization_email'])
-            : $this->organization_config->email;
-        $this->organization_config->vat          = isset($form_data['organization_vat'])
-            ? sanitize_text_field($form_data['organization_vat'])
-            : $this->organization_config->vat;
-        $this->organization_config->phone        = isset($form_data['organization_phone'])
-            ? sanitize_text_field($form_data['organization_phone'])
-            : $this->organization_config->phone;
-        $this->organization_config->logo_url     = isset($form_data['organization_logo_url'])
-            ? esc_url_raw($form_data['organization_logo_url'])
-            : $this->organization_config->logo_url;
-        $this->organization_config->facebook     = isset($form_data['organization_facebook'])
-            ? esc_url_raw($form_data['organization_facebook'])
-            : $this->organization_config->facebook;
-        $this->organization_config->twitter      = isset($form_data['organization_twitter'])
-            ? esc_url_raw($form_data['organization_twitter'])
-            : $this->organization_config->twitter;
-        $this->organization_config->linkedin     = isset($form_data['organization_linkedin'])
-            ? esc_url_raw($form_data['organization_linkedin'])
-            : $this->organization_config->linkedin;
-        $this->organization_config->pinterest    = isset($form_data['organization_pinterest'])
-            ? esc_url_raw($form_data['organization_pinterest'])
-            : $this->organization_config->pinterest;
-        $this->organization_config->google       = isset($form_data['organization_google'])
-            ? esc_url_raw($form_data['organization_google'])
-            : $this->organization_config->google;
-        $this->organization_config->instagram    = isset($form_data['organization_instagram'])
-            ? esc_url_raw($form_data['organization_instagram'])
-            : $this->organization_config->instagram;
-        $this->core_config->ee_ueip_optin        = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
-            ? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
-            : false;
-        $this->core_config->ee_ueip_has_notified = true;
+		if (is_main_site()) {
+			$this->network_core_config->site_license_key = isset($form_data['ee_site_license_key'])
+				? sanitize_text_field($form_data['ee_site_license_key'])
+				: $this->network_core_config->site_license_key;
+		}
+		$this->organization_config->name         = isset($form_data['organization_name'])
+			? sanitize_text_field($form_data['organization_name'])
+			: $this->organization_config->name;
+		$this->organization_config->address_1    = isset($form_data['organization_address_1'])
+			? sanitize_text_field($form_data['organization_address_1'])
+			: $this->organization_config->address_1;
+		$this->organization_config->address_2    = isset($form_data['organization_address_2'])
+			? sanitize_text_field($form_data['organization_address_2'])
+			: $this->organization_config->address_2;
+		$this->organization_config->city         = isset($form_data['organization_city'])
+			? sanitize_text_field($form_data['organization_city'])
+			: $this->organization_config->city;
+		$this->organization_config->STA_ID       = isset($form_data['organization_state'])
+			? absint($form_data['organization_state'])
+			: $this->organization_config->STA_ID;
+		$this->organization_config->CNT_ISO      = isset($form_data['organization_country'])
+			? sanitize_text_field($form_data['organization_country'])
+			: $this->organization_config->CNT_ISO;
+		$this->organization_config->zip          = isset($form_data['organization_zip'])
+			? sanitize_text_field($form_data['organization_zip'])
+			: $this->organization_config->zip;
+		$this->organization_config->email        = isset($form_data['organization_email'])
+			? sanitize_email($form_data['organization_email'])
+			: $this->organization_config->email;
+		$this->organization_config->vat          = isset($form_data['organization_vat'])
+			? sanitize_text_field($form_data['organization_vat'])
+			: $this->organization_config->vat;
+		$this->organization_config->phone        = isset($form_data['organization_phone'])
+			? sanitize_text_field($form_data['organization_phone'])
+			: $this->organization_config->phone;
+		$this->organization_config->logo_url     = isset($form_data['organization_logo_url'])
+			? esc_url_raw($form_data['organization_logo_url'])
+			: $this->organization_config->logo_url;
+		$this->organization_config->facebook     = isset($form_data['organization_facebook'])
+			? esc_url_raw($form_data['organization_facebook'])
+			: $this->organization_config->facebook;
+		$this->organization_config->twitter      = isset($form_data['organization_twitter'])
+			? esc_url_raw($form_data['organization_twitter'])
+			: $this->organization_config->twitter;
+		$this->organization_config->linkedin     = isset($form_data['organization_linkedin'])
+			? esc_url_raw($form_data['organization_linkedin'])
+			: $this->organization_config->linkedin;
+		$this->organization_config->pinterest    = isset($form_data['organization_pinterest'])
+			? esc_url_raw($form_data['organization_pinterest'])
+			: $this->organization_config->pinterest;
+		$this->organization_config->google       = isset($form_data['organization_google'])
+			? esc_url_raw($form_data['organization_google'])
+			: $this->organization_config->google;
+		$this->organization_config->instagram    = isset($form_data['organization_instagram'])
+			? esc_url_raw($form_data['organization_instagram'])
+			: $this->organization_config->instagram;
+		$this->core_config->ee_ueip_optin        = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
+			? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
+			: false;
+		$this->core_config->ee_ueip_has_notified = true;
 
-        $this->registry->CFG->currency = new EE_Currency_Config(
-            $this->organization_config->CNT_ISO
-        );
-        /** @var EE_Country $country */
-        $country = EEM_Country::instance()->get_one_by_ID($this->organization_config->CNT_ISO);
-        if ($country instanceof EE_Country) {
-            $country->set('CNT_active', 1);
-            $country->save();
-            $this->countrySubRegionDao->saveCountrySubRegions($country);
-        }
-        return true;
-    }
+		$this->registry->CFG->currency = new EE_Currency_Config(
+			$this->organization_config->CNT_ISO
+		);
+		/** @var EE_Country $country */
+		$country = EEM_Country::instance()->get_one_by_ID($this->organization_config->CNT_ISO);
+		if ($country instanceof EE_Country) {
+			$country->set('CNT_active', 1);
+			$country->save();
+			$this->countrySubRegionDao->saveCountrySubRegions($country);
+		}
+		return true;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function uxipOptinText()
-    {
-        ob_start();
-        Stats::optinText(false);
-        return ob_get_clean();
-    }
+	/**
+	 * @return string
+	 */
+	private function uxipOptinText()
+	{
+		ob_start();
+		Stats::optinText(false);
+		return ob_get_clean();
+	}
 
 
-    /**
-     * Return whether the site license key has been verified or not.
-     *
-     * @return bool
-     */
-    private function licenseKeyVerified()
-    {
-        if (empty($this->network_core_config->site_license_key)) {
-            return false;
-        }
-        $ver_option_key = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
-        $verify_fail    = get_option($ver_option_key, false);
-        return $verify_fail === false
-               || ! empty($this->network_core_config->site_license_key);
-    }
+	/**
+	 * Return whether the site license key has been verified or not.
+	 *
+	 * @return bool
+	 */
+	private function licenseKeyVerified()
+	{
+		if (empty($this->network_core_config->site_license_key)) {
+			return false;
+		}
+		$ver_option_key = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
+		$verify_fail    = get_option($ver_option_key, false);
+		return $verify_fail === false
+			   || ! empty($this->network_core_config->site_license_key);
+	}
 
 
-    /**
-     * @return EE_Text_Input
-     */
-    private function getSiteLicenseKeyField()
-    {
-        $class = $this->licenseKeyVerified() ? 'ee-status-outline--success' : 'ee-status-outline--error';
-        return new EE_Text_Input(
-            [
-                'html_name'        => 'ee_site_license_key',
-                'html_id'          => 'site_license_key',
-                'html_class'       => 'ee-status-outline ' . $class,
-                'html_label_text'  => esc_html__('Support License Key', 'event_espresso'),
-                /** phpcs:disable WordPress.WP.I18n.UnorderedPlaceholdersText */
-                'html_help_text'   => sprintf(
-                    esc_html__(
-                        'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ),
-                /** phpcs:enable */
-                'default'          => $this->network_core_config->site_license_key ?? '',
-                'required'         => false,
-                'form_html_filter' => new VsprintfFilter(
-                    '%2$s %1$s',
-                    [$this->getValidationIndicator()]
-                ),
-            ]
-        );
-    }
+	/**
+	 * @return EE_Text_Input
+	 */
+	private function getSiteLicenseKeyField()
+	{
+		$class = $this->licenseKeyVerified() ? 'ee-status-outline--success' : 'ee-status-outline--error';
+		return new EE_Text_Input(
+			[
+				'html_name'        => 'ee_site_license_key',
+				'html_id'          => 'site_license_key',
+				'html_class'       => 'ee-status-outline ' . $class,
+				'html_label_text'  => esc_html__('Support License Key', 'event_espresso'),
+				/** phpcs:disable WordPress.WP.I18n.UnorderedPlaceholdersText */
+				'html_help_text'   => sprintf(
+					esc_html__(
+						'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				),
+				/** phpcs:enable */
+				'default'          => $this->network_core_config->site_license_key ?? '',
+				'required'         => false,
+				'form_html_filter' => new VsprintfFilter(
+					'%2$s %1$s',
+					[$this->getValidationIndicator()]
+				),
+			]
+		);
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getValidationIndicator()
-    {
-        $class = $this->licenseKeyVerified() ? 'ee-status--success' : 'ee-status--error';
-        return '<span class="dashicons dashicons-admin-network ' . $class . '"></span>';
-    }
+	/**
+	 * @return string
+	 */
+	private function getValidationIndicator()
+	{
+		$class = $this->licenseKeyVerified() ? 'ee-status--success' : 'ee-status--error';
+		return '<span class="dashicons dashicons-admin-network ' . $class . '"></span>';
+	}
 }

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Indentation +1419 added lines, -1419 removed lines

@@ -19,1436 +19,1436 @@
  */
 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;
-    }
-
-
-    /**
-     * 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'       => '_espresso_page_settings',
-                'capability' => 'manage_options',
-            ],
-            'update_espresso_page_settings' => [
-                'func'       => '_update_espresso_page_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'default'                       => [
-                'func'       => '_your_organization_settings',
-                'capability' => 'manage_options',
-            ],
-
-            'update_your_organization_settings' => [
-                'func'       => '_update_your_organization_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'admin_option_settings' => [
-                'func'       => '_admin_option_settings',
-                'capability' => 'manage_options',
-            ],
-
-            'update_admin_option_settings' => [
-                'func'       => '_update_admin_option_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'country_settings' => [
-                'func'       => '_country_settings',
-                'capability' => 'manage_options',
-            ],
-
-            'update_country_settings' => [
-                'func'       => '_update_country_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'display_country_settings' => [
-                'func'       => 'display_country_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'add_new_state' => [
-                'func'       => 'add_new_state',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'delete_state'            => [
-                'func'       => 'delete_state',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'privacy_settings'        => [
-                'func'       => 'privacySettings',
-                'capability' => 'manage_options',
-            ],
-            'update_privacy_settings' => [
-                'func'               => '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'),
-                    'icon' => 'dashicons-warning',
-                    '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'),
-                    'icon' => 'dashicons-admin-home',
-                    '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'),
-                    'icon' => 'dashicons-admin-settings',
-                    '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'),
-                    'icon' => 'dashicons-admin-site',
-                    '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'),
-                    'icon' => 'dashicons-privacy',
-                    '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()
-    {
-        $this->core_config = EE_Registry::instance()->CFG->core;
-
-        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()
-    {
-        $this->core_config = EE_Registry::instance()->CFG->core;
-        // 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'] = EEH_HTML::div(
-                $admin_options_settings_form->display(),
-                '',
-                'padding'
-            );
-        } 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::STRING,
-                    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'      => 'ee-input-width--small',
-            ],
-            'CNT_ISO3'        => [
-                'type'       => 'TEXT',
-                'input_name' => "cntry[$CNT_ISO]",
-                'class'      => 'ee-input-width--small',
-            ],
-            // 'RGN_ID'          => [
-            //     'type'       => 'TEXT',
-            //     'input_name' => "cntry[$CNT_ISO]",
-            //     'class'      => 'ee-input-width--small',
-            // ],
-            'CNT_name'        => [
-                'type'       => 'TEXT',
-                'input_name' => "cntry[$CNT_ISO]",
-                'class'      => 'ee-input-width--big',
-            ],
-            'CNT_cur_code'    => [
-                'type'       => 'TEXT',
-                'input_name' => "cntry[$CNT_ISO]",
-                'class'      => 'ee-input-width--small',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_single'  => [
-                'type'       => 'TEXT',
-                'input_name' => "cntry[$CNT_ISO]",
-                'class'      => 'ee-input-width--reg',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_plural'  => [
-                'type'       => 'TEXT',
-                'input_name' => "cntry[$CNT_ISO]",
-                'class'      => 'ee-input-width--reg',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_sign'    => [
-                'type'         => 'TEXT',
-                'input_name'   => "cntry[$CNT_ISO]",
-                'class'        => 'ee-input-width--small',
-                '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'),
-                    ],
-                ],
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_tel_code'    => [
-                'type'       => 'TEXT',
-                'input_name' => "cntry[$CNT_ISO]",
-                'class'      => 'ee-input-width--small',
-            ],
-            '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'            => 'ee-input-width--tiny',
-                                'add_mobile_label' => true,
-                            ],
-                            'STA_name'   => [
-                                'type'             => 'TEXT',
-                                'label'            => esc_html__('Name', 'event_espresso'),
-                                'input_name'       => "states[$STA_ID]",
-                                'class'            => 'ee-input-width--big',
-                                '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();
-        }
-        $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();
-        }
-        $this->_redirect_after_action(
-            $success,
-            esc_html__('State', 'event_espresso'),
-            'deleted',
-            ['action' => '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', '', $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;
+	}
+
+
+	/**
+	 * 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'       => '_espresso_page_settings',
+				'capability' => 'manage_options',
+			],
+			'update_espresso_page_settings' => [
+				'func'       => '_update_espresso_page_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'default'                       => [
+				'func'       => '_your_organization_settings',
+				'capability' => 'manage_options',
+			],
+
+			'update_your_organization_settings' => [
+				'func'       => '_update_your_organization_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'admin_option_settings' => [
+				'func'       => '_admin_option_settings',
+				'capability' => 'manage_options',
+			],
+
+			'update_admin_option_settings' => [
+				'func'       => '_update_admin_option_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'country_settings' => [
+				'func'       => '_country_settings',
+				'capability' => 'manage_options',
+			],
+
+			'update_country_settings' => [
+				'func'       => '_update_country_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'display_country_settings' => [
+				'func'       => 'display_country_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'add_new_state' => [
+				'func'       => 'add_new_state',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'delete_state'            => [
+				'func'       => 'delete_state',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'privacy_settings'        => [
+				'func'       => 'privacySettings',
+				'capability' => 'manage_options',
+			],
+			'update_privacy_settings' => [
+				'func'               => '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'),
+					'icon' => 'dashicons-warning',
+					'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'),
+					'icon' => 'dashicons-admin-home',
+					'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'),
+					'icon' => 'dashicons-admin-settings',
+					'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'),
+					'icon' => 'dashicons-admin-site',
+					'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'),
+					'icon' => 'dashicons-privacy',
+					'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()
+	{
+		$this->core_config = EE_Registry::instance()->CFG->core;
+
+		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()
+	{
+		$this->core_config = EE_Registry::instance()->CFG->core;
+		// 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'] = EEH_HTML::div(
+				$admin_options_settings_form->display(),
+				'',
+				'padding'
+			);
+		} 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::STRING,
+					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'      => 'ee-input-width--small',
+			],
+			'CNT_ISO3'        => [
+				'type'       => 'TEXT',
+				'input_name' => "cntry[$CNT_ISO]",
+				'class'      => 'ee-input-width--small',
+			],
+			// 'RGN_ID'          => [
+			//     'type'       => 'TEXT',
+			//     'input_name' => "cntry[$CNT_ISO]",
+			//     'class'      => 'ee-input-width--small',
+			// ],
+			'CNT_name'        => [
+				'type'       => 'TEXT',
+				'input_name' => "cntry[$CNT_ISO]",
+				'class'      => 'ee-input-width--big',
+			],
+			'CNT_cur_code'    => [
+				'type'       => 'TEXT',
+				'input_name' => "cntry[$CNT_ISO]",
+				'class'      => 'ee-input-width--small',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_single'  => [
+				'type'       => 'TEXT',
+				'input_name' => "cntry[$CNT_ISO]",
+				'class'      => 'ee-input-width--reg',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_plural'  => [
+				'type'       => 'TEXT',
+				'input_name' => "cntry[$CNT_ISO]",
+				'class'      => 'ee-input-width--reg',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_sign'    => [
+				'type'         => 'TEXT',
+				'input_name'   => "cntry[$CNT_ISO]",
+				'class'        => 'ee-input-width--small',
+				'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'),
+					],
+				],
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_tel_code'    => [
+				'type'       => 'TEXT',
+				'input_name' => "cntry[$CNT_ISO]",
+				'class'      => 'ee-input-width--small',
+			],
+			'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'            => 'ee-input-width--tiny',
+								'add_mobile_label' => true,
+							],
+							'STA_name'   => [
+								'type'             => 'TEXT',
+								'label'            => esc_html__('Name', 'event_espresso'),
+								'input_name'       => "states[$STA_ID]",
+								'class'            => 'ee-input-width--big',
+								'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();
+		}
+		$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();
+		}
+		$this->_redirect_after_action(
+			$success,
+			esc_html__('State', 'event_espresso'),
+			'deleted',
+			['action' => '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', '', $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_class  = 'ee-status-bg--success';
-            $pg_status = sprintf(esc_html__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
-        } else {
-            $pg_class  = 'ee-status-bg--error';
-            $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_class  = 'ee-status-bg--success';
-            $sc_status = sprintf(esc_html__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
-        } else {
-            $sc_class  = 'ee-status-bg--error';
-            $sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
-        }
-
-        return '
+	}
+
+
+	/***********/
+
+
+	/**
+	 * 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_class  = 'ee-status-bg--success';
+			$pg_status = sprintf(esc_html__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
+		} else {
+			$pg_class  = 'ee-status-bg--error';
+			$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_class  = 'ee-status-bg--success';
+			$sc_status = sprintf(esc_html__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
+		} else {
+			$sc_class  = 'ee-status-bg--error';
+			$sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
+		}
+
+		return '
         <span class="ee-page-status ' . $pg_class . '"><strong>' . $pg_status . '</strong></span>
         <span class="ee-page-status ' . $sc_class . '"><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']
-        );
-    }
+	}
+
+
+	/**
+	 * 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']
+		);
+	}
 }

admin_pages/general_settings/templates/espresso_page_settings.template.php

Indentation +63 added lines, -63 removed lines

@@ -17,13 +17,13 @@ 
     </h2>
     <p class="ee-attention">
         <?php printf(
-            esc_html__(
-                'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
-                'event_espresso'
-            ),
-            '<a href="admin.php?page=espresso_support">',
-            '</a>'
-        );
+			esc_html__(
+				'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
+				'event_espresso'
+			),
+			'<a href="admin.php?page=espresso_support">',
+			'</a>'
+		);
 ?>
     </p>
 
@@ -54,19 +54,19 @@ 
                     </select>
                     <div class="ee-page-status__wrapper">
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $reg_page_obj,
-                        '[ESPRESSO_CHECKOUT]'
-                    ); // already escaped ?>
+						$reg_page_obj,
+						'[ESPRESSO_CHECKOUT]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
-                        );
+							esc_html__(
+								'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -101,19 +101,19 @@ 
                     </select>
                     <div class='ee-page-status__wrapper'>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $txn_page_obj,
-                        '[ESPRESSO_TXN_PAGE]'
-                    ); // already escaped ?>
+						$txn_page_obj,
+						'[ESPRESSO_TXN_PAGE]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
-                        );
+							esc_html__(
+								'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -144,19 +144,19 @@ 
                     </select>
                     <div class='ee-page-status__wrapper'>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $thank_you_page_obj,
-                        '[ESPRESSO_THANK_YOU]'
-                    ); // already escaped ?>
+						$thank_you_page_obj,
+						'[ESPRESSO_THANK_YOU]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
-                        );
+							esc_html__(
+								'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -187,19 +187,19 @@ 
                     </select>
                     <div class='ee-page-status__wrapper'>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $cancel_page_obj,
-                        '[ESPRESSO_CANCELLED]'
-                    ); // already escaped ?>
+						$cancel_page_obj,
+						'[ESPRESSO_CANCELLED]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
-                        );
+							esc_html__(
+								'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -222,19 +222,19 @@ 
                 <td>
                     <p class="description">
                         <?php esc_html_e(
-                            'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
-                            'event_espresso'
-                        ) ?>
+							'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
+							'event_espresso'
+						) ?>
                     </p>
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
-                                'event_espresso'
-                            ),
-                            '<a href="admin.php?page=espresso_support">',
-                            '</a>'
-                        ); ?>
+							esc_html__(
+								'If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
+								'event_espresso'
+							),
+							'<a href="admin.php?page=espresso_support">',
+							'</a>'
+						); ?>
                     </p>
                     <br /><br />
                 </td>
@@ -256,19 +256,19 @@ 
                 <td>
                     <p class="description">
                         <?php esc_html_e(
-                            'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
-                            'event_espresso'
-                        ) ?>
+							'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
+							'event_espresso'
+						) ?>
                     </p>
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
-                                'event_espresso'
-                            ),
-                            '<a href="admin.php?page=espresso_support">',
-                            '</a>'
-                        ); ?>
+							esc_html__(
+								'If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
+								'event_espresso'
+							),
+							'<a href="admin.php?page=espresso_support">',
+							'</a>'
+						); ?>
                     </p>
                 </td>
             </tr>

admin_pages/support/Support_Admin_Page.core.php

Indentation +240 added lines, -240 removed lines

@@ -11,244 +11,244 @@
  */
 class Support_Admin_Page extends EE_Admin_Page
 {
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_SUPPORT_PG_SLUG;
-        $this->page_label = esc_html__('Help & Support', 'event_espresso');
-        $this->_admin_base_url = EE_SUPPORT_ADMIN_URL;
-        $this->_admin_base_path = EE_SUPPORT_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_labels = array();
-        $this->_admin_page_title = $this->page_label;
-    }
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default'    => array(
-                'func'       => '_contact_support',
-                'capability' => 'ee_read_ee',
-            ),
-            'developers' => array(
-                'func'       => '_developers',
-                'capability' => 'ee_read_ee',
-            ),
-            'shortcodes' => array(
-                'func'       => '_shortcodes',
-                'capability' => 'ee_read_ee',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default'    => array(
-                'nav'           => array(
-                    'label' => esc_html__('Support', 'event_espresso'),
-                    'icon' => 'dashicons-sos',
-                    'order' => 30,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
-                'require_nonce' => false,
-            ),
-            'developers' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Developers', 'event_espresso'),
-                    'icon' => 'dashicons-coffee',
-                    'order' => 50,
-                ),
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ),
-            'shortcodes' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Shortcodes', 'event_espresso'),
-                    'icon' => 'dashicons-shortcode',
-                    'order' => 60,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    // none of the below group are currently used for Support pages
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-    }
-
-
-    protected function _installation()
-    {
-        $template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $template_path,
-            '',
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _resources()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _add_settings_metabox($box, $label, array $args)
-    {
-        $this->addMetaBox(
-            "espresso_{$box}_settings",
-            $label,
-            function ($post, $metabox) {
-                EEH_Template::display_template(
-                    $metabox['args']['template_path'],
-                    $metabox['args']['template_args']
-                );
-            },
-            $this->_current_screen->id,
-            'normal',
-            'high',
-            apply_filters(
-                "FHEE__Support_Admin_Page___add_settings_metabox__{$box}_args_array",
-                $args
-            )
-        );
-    }
-
-
-    protected function _resources_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___resources_boxes__boxes_array',
-            array(
-                'favorite_theme_developers' => esc_html__('Favorite Theme Developers', 'event_espresso'),
-                'highly_recommended_themes' => esc_html__('Highly Recommended Themes', 'event_espresso'),
-                'hire_developer'            => esc_html__('Hire a Developer', 'event_espresso'),
-                'partners'                  => esc_html__('Partners', 'event_espresso'),
-                'recommended_plugins'       => esc_html__('Recommended Plugins', 'event_espresso'),
-                'other_resources'           => esc_html__('Other Resources', 'event_espresso'),
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _shortcodes()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _shortcodes_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___shortcodes_boxes__boxes_array',
-            array(
-                'shortcodes_event_listings'  => esc_html__('Event Listings', 'event_espresso'),
-                'shortcodes_ticket_selector' => esc_html__('Event Ticket Selector', 'event_espresso'),
-                'shortcodes_category'        => esc_html__('Event Categories', 'event_espresso'),
-                'shortcodes_attendee'        => esc_html__('Event Attendees', 'event_espresso')
-                /*'shortcodes_single_events' => esc_html__('Single Events', 'event_espresso'),*/
-                /*'shortcodes_attendee_listings' => esc_html__('Attendee Listings', 'event_espresso'),*/
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _contact_support()
-    {
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _support_boxes()
-    {
-        $boxes = apply_filters(
-            'FHEE__Support_Admin_Page___support_boxes__boxes_array',
-            array(
-                'contact_support'       => esc_html__('Contact Support', 'event_espresso'),
-                'important_information' => esc_html__('Important Information', 'event_espresso'),
-            )
-        );
-        foreach ($boxes as $box => $label) {
-            $this->_add_settings_metabox(
-                $box,
-                $label,
-                array(
-                    'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
-                    'template_args' => $this->_template_args,
-                )
-            );
-        }
-    }
-
-
-    protected function _developers()
-    {
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
-            array(),
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_SUPPORT_PG_SLUG;
+		$this->page_label = esc_html__('Help & Support', 'event_espresso');
+		$this->_admin_base_url = EE_SUPPORT_ADMIN_URL;
+		$this->_admin_base_path = EE_SUPPORT_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_labels = array();
+		$this->_admin_page_title = $this->page_label;
+	}
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default'    => array(
+				'func'       => '_contact_support',
+				'capability' => 'ee_read_ee',
+			),
+			'developers' => array(
+				'func'       => '_developers',
+				'capability' => 'ee_read_ee',
+			),
+			'shortcodes' => array(
+				'func'       => '_shortcodes',
+				'capability' => 'ee_read_ee',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default'    => array(
+				'nav'           => array(
+					'label' => esc_html__('Support', 'event_espresso'),
+					'icon' => 'dashicons-sos',
+					'order' => 30,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
+				'require_nonce' => false,
+			),
+			'developers' => array(
+				'nav'           => array(
+					'label' => esc_html__('Developers', 'event_espresso'),
+					'icon' => 'dashicons-coffee',
+					'order' => 50,
+				),
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			),
+			'shortcodes' => array(
+				'nav'           => array(
+					'label' => esc_html__('Shortcodes', 'event_espresso'),
+					'icon' => 'dashicons-shortcode',
+					'order' => 60,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	// none of the below group are currently used for Support pages
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+	}
+
+
+	protected function _installation()
+	{
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$template_path,
+			'',
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _resources()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _add_settings_metabox($box, $label, array $args)
+	{
+		$this->addMetaBox(
+			"espresso_{$box}_settings",
+			$label,
+			function ($post, $metabox) {
+				EEH_Template::display_template(
+					$metabox['args']['template_path'],
+					$metabox['args']['template_args']
+				);
+			},
+			$this->_current_screen->id,
+			'normal',
+			'high',
+			apply_filters(
+				"FHEE__Support_Admin_Page___add_settings_metabox__{$box}_args_array",
+				$args
+			)
+		);
+	}
+
+
+	protected function _resources_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___resources_boxes__boxes_array',
+			array(
+				'favorite_theme_developers' => esc_html__('Favorite Theme Developers', 'event_espresso'),
+				'highly_recommended_themes' => esc_html__('Highly Recommended Themes', 'event_espresso'),
+				'hire_developer'            => esc_html__('Hire a Developer', 'event_espresso'),
+				'partners'                  => esc_html__('Partners', 'event_espresso'),
+				'recommended_plugins'       => esc_html__('Recommended Plugins', 'event_espresso'),
+				'other_resources'           => esc_html__('Other Resources', 'event_espresso'),
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _shortcodes()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _shortcodes_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___shortcodes_boxes__boxes_array',
+			array(
+				'shortcodes_event_listings'  => esc_html__('Event Listings', 'event_espresso'),
+				'shortcodes_ticket_selector' => esc_html__('Event Ticket Selector', 'event_espresso'),
+				'shortcodes_category'        => esc_html__('Event Categories', 'event_espresso'),
+				'shortcodes_attendee'        => esc_html__('Event Attendees', 'event_espresso')
+				/*'shortcodes_single_events' => esc_html__('Single Events', 'event_espresso'),*/
+				/*'shortcodes_attendee_listings' => esc_html__('Attendee Listings', 'event_espresso'),*/
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _contact_support()
+	{
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _support_boxes()
+	{
+		$boxes = apply_filters(
+			'FHEE__Support_Admin_Page___support_boxes__boxes_array',
+			array(
+				'contact_support'       => esc_html__('Contact Support', 'event_espresso'),
+				'important_information' => esc_html__('Important Information', 'event_espresso'),
+			)
+		);
+		foreach ($boxes as $box => $label) {
+			$this->_add_settings_metabox(
+				$box,
+				$label,
+				array(
+					'template_path' => EE_SUPPORT_ADMIN_TEMPLATE_PATH . "support_admin_details_{$box}.template.php",
+					'template_args' => $this->_template_args,
+				)
+			);
+		}
+	}
+
+
+	protected function _developers()
+	{
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php',
+			array(),
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
 }