eventespresso / event-espresso-core

caffeinated/modules/events_archive_caff/templates/admin-event-list-settings.template.php

Indentation +107 added lines, -107 removed lines

@@ -5,18 +5,18 @@ 
 add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 
 $values = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
-        array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
-    )
+	array(
+		array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
+	)
 );
 
 $description = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 0, 'text' => esc_html__('none', 'event_espresso')),
-        array('id' => 1, 'text' => esc_html__('excerpt (short desc)', 'event_espresso')),
-        array('id' => 2, 'text' => esc_html__('full description', 'event_espresso')),
-    )
+	array(
+		array('id' => 0, 'text' => esc_html__('none', 'event_espresso')),
+		array('id' => 1, 'text' => esc_html__('excerpt (short desc)', 'event_espresso')),
+		array('id' => 2, 'text' => esc_html__('full description', 'event_espresso')),
+	)
 );
 
 $event_archive_url = EEH_Event_View::event_archive_url();
@@ -37,8 +37,8 @@ 
         <th>
             <label for="event_listings_url">
                 <?php esc_html_e('Event Listings URL', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'event_listings_url_info'
-                ); ?>
+					'event_listings_url_info'
+				); ?>
             </label>
         </th>
         <td>
@@ -57,30 +57,30 @@ 
         </th>
         <td>
             <?php echo site_url() . '/ '
-                      . EEH_Form_Fields::text(
-                          'not_used',
-                          EE_Registry::instance()->CFG->core->event_cpt_slug,
-                          'event_cpt_slug',
-                          'event_cpt_slug',
-                          'regular'
-                      ); ?>
+					  . EEH_Form_Fields::text(
+						  'not_used',
+						  EE_Registry::instance()->CFG->core->event_cpt_slug,
+						  'event_cpt_slug',
+						  'event_cpt_slug',
+						  'regular'
+					  ); ?>
             <p class="description"><?php
-                esc_html_e(
-                    'This allows you to configure what slug is used for the url of all event pages.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'This allows you to configure what slug is used for the url of all event pages.',
+					'event_espresso'
+				); ?></p>
             <?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
                 <p class="important-notice">
                     <?php
-                    sprintf(
-                        esc_html__(
-                            'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
-                            'event_espresso'
-                        ),
-                        '<code>',
-                        '</code>'
-                    );
-                    ?>
+					sprintf(
+						esc_html__(
+							'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
+							'event_espresso'
+						),
+						'<code>',
+						'</code>'
+					);
+					?>
                 </p>
             <?php endif; ?>
         </td>
@@ -94,17 +94,17 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_status_banner',
-                $display_status_banner,
-                $values,
-                'EED_Events_Archive_display_status_banner',
-                'EED_Events_Archive_display_status_banner'
-            ); ?>
+				'display_status_banner',
+				$display_status_banner,
+				$values,
+				'EED_Events_Archive_display_status_banner',
+				'EED_Events_Archive_display_status_banner'
+			); ?>
             <p class="description"><?php
-                esc_html_e(
-                    'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -112,18 +112,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_description">
                 <?php esc_html_e('Display Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_description_info'
-                ); ?>
+					'display_description_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'description',
-                $display_description,
-                $description,
-                'EED_Events_Archive_display_description',
-                'EED_Events_Archive_display_description'
-            ); ?>
+				'description',
+				$display_description,
+				$description,
+				'EED_Events_Archive_display_description',
+				'EED_Events_Archive_display_description'
+			); ?>
         </td>
     </tr>
 
@@ -131,18 +131,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_ticket_selector">
                 <?php esc_html_e('Display Ticket Selector', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_ticket_selector_info'
-                ); ?>
+					'display_ticket_selector_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'ticket_selector',
-                $display_ticket_selector,
-                $values,
-                'EED_Events_Archive_display_ticket_selector',
-                'EED_Events_Archive_display_ticket_selector'
-            ); ?>
+				'ticket_selector',
+				$display_ticket_selector,
+				$values,
+				'EED_Events_Archive_display_ticket_selector',
+				'EED_Events_Archive_display_ticket_selector'
+			); ?>
         </td>
     </tr>
 
@@ -150,18 +150,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_datetimes">
                 <?php esc_html_e('Display Datetimes', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_datetimes_info'
-                ); ?>
+					'display_datetimes_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'venue_details',
-                $display_datetimes,
-                $values,
-                'EED_Events_Archive_display_datetimes',
-                'EED_Events_Archive_display_datetimes'
-            ); ?>
+				'venue_details',
+				$display_datetimes,
+				$values,
+				'EED_Events_Archive_display_datetimes',
+				'EED_Events_Archive_display_datetimes'
+			); ?>
         </td>
     </tr>
 
@@ -169,18 +169,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_venue">
                 <?php esc_html_e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_venue_details_info'
-                ); ?>
+					'display_venue_details_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_venue',
-                $display_venue,
-                $values,
-                'EED_Events_Archive_display_venue',
-                'EED_Events_Archive_display_venue'
-            ); ?>
+				'display_venue',
+				$display_venue,
+				$values,
+				'EED_Events_Archive_display_venue',
+				'EED_Events_Archive_display_venue'
+			); ?>
         </td>
     </tr>
 
@@ -188,18 +188,18 @@ 
         <th>
             <label for="EED_Events_Archive_display_expired_events">
                 <?php esc_html_e('Display Expired Events', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_expired_events_info'
-                ); ?>
+					'display_expired_events_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'expired_events',
-                $display_expired_events,
-                $values,
-                'EED_Events_Archive_display_expired_events',
-                'EED_Events_Archive_display_expired_events'
-            ); ?>
+				'expired_events',
+				$display_expired_events,
+				$values,
+				'EED_Events_Archive_display_expired_events',
+				'EED_Events_Archive_display_expired_events'
+			); ?>
         </td>
     </tr>
 
@@ -207,43 +207,43 @@ 
         <th>
             <label for="EED_Events_Archive_use_sortable_display_order">
                 <?php esc_html_e(
-                    'Use Custom Display Order?',
-                    'event_espresso'
-                ); ?><?php // echo EEH_Template::get_help_tab_link('use_sortable_display_order_info');?>
+					'Use Custom Display Order?',
+					'event_espresso'
+				); ?><?php // echo EEH_Template::get_help_tab_link('use_sortable_display_order_info');?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'use_sortable_display_order',
-                $use_sortable_display_order,
-                $values,
-                'EED_Events_Archive_use_sortable_display_order',
-                'EED_Events_Archive_use_sortable_display_order'
-            ); ?>
+				'use_sortable_display_order',
+				$use_sortable_display_order,
+				$values,
+				'EED_Events_Archive_use_sortable_display_order',
+				'EED_Events_Archive_use_sortable_display_order'
+			); ?>
         </td>
     </tr>
 
     <tr>
         <th>
             <?php esc_html_e(
-                'Display Order',
-                'event_espresso'
-            ); ?><?php // echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
+				'Display Order',
+				'event_espresso'
+			); ?><?php // echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
         </th>
         <td>
 
             <?php wp_nonce_field(
-                'espresso_update_event_archive_order',
-                'espresso_update_event_archive_order_nonce',
-                false
-            ); ?>
+				'espresso_update_event_archive_order',
+				'espresso_update_event_archive_order_nonce',
+				false
+			); ?>
             <?php echo wp_kses($event_archive_display_order, AllowedTags::getWithFormTags()); ?>
 
             <p class="description"><?php
-                esc_html_e(
-                    'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
+					'event_espresso'
+				); ?></p>
 
         </td>
     </tr>
@@ -256,12 +256,12 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'reset_event_list_settings',
-                0,
-                $values,
-                'EED_Events_Archive_reset_event_list_settings',
-                'EED_Events_Archive_reset_event_list_settings'
-            ); ?>
+				'reset_event_list_settings',
+				0,
+				$values,
+				'EED_Events_Archive_reset_event_list_settings',
+				'EED_Events_Archive_reset_event_list_settings'
+			); ?>
         </td>
     </tr>
 

caffeinated/modules/ticket_selector_caff/templates/ticket_selector_price_details.template.php

Indentation +58 added lines, -58 removed lines

@@ -10,10 +10,10 @@ 
  */
 
 if (! function_exists('espressoSubtotalRow')) {
-    function espressoSubtotalRow(float $running_total, bool $show = true): string
-    {
-        return $show
-            ? '
+	function espressoSubtotalRow(float $running_total, bool $show = true): string
+	{
+		return $show
+			? '
                 <tr>
                     <td colspan="2" class="jst-rght small-text sbttl">
                         <b>' . esc_html__('subtotal', 'event_espresso') . '</b>
@@ -23,18 +23,18 @@ 
                     </td>
                 </tr>
             '
-            : '';
-    }
+			: '';
+	}
 }
 
 if ($display_ticket_price) { ?>
     <section class="tckt-slctr-tkt-price-sctn">
         <h5><?php echo esc_html(
-            apply_filters(
-                'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-                __('Price', 'event_espresso')
-            )
-        ); ?></h5>
+			apply_filters(
+				'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
+				__('Price', 'event_espresso')
+			)
+		); ?></h5>
         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
             <table class="tckt-slctr-tkt-details-tbl">
                 <thead>
@@ -54,7 +54,7 @@ 
                 </thead>
                 <tbody>
                     <?php
-                    if ($ticket->base_price() instanceof EE_Price) { ?>
+					if ($ticket->base_price() instanceof EE_Price) { ?>
                         <tr>
                             <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>" class="small-text" colspan="2">
                                 <b>
@@ -66,31 +66,31 @@ 
                             </td>
                         </tr>
                         <?php
-                        $running_total = $ticket->base_price()->amount();
-                    } else {
-                        $running_total = 0;
-                    }
-                    $pretax_total     = $running_total;
-                    $display_subtotal = true;
-                    // now add price modifiers
-                    foreach ($ticket->price_modifiers() as $price_mod) {
-                        if ($price_mod->is_tax()) {
-                            echo espressoSubtotalRow($running_total, $display_subtotal);
-                            $display_subtotal = false;
-                            $new_sub_total    = $pretax_total * ($price_mod->amount() / 100);
-                        } elseif ($price_mod->is_percent()) {
-                            $new_sub_total = $running_total * ($price_mod->amount() / 100);
-                        } else {
-                            $new_sub_total = $price_mod->amount();
-                        }
-                        $new_sub_total = $price_mod->is_discount()
-                            ? $new_sub_total * -1
-                            : $new_sub_total;
-                        $description   = $price_mod->desc() . ' ';
-                        $description   .= $price_mod->is_percent()
-                            ? $price_mod->amount() . '%'
-                            : EEH_Template::format_currency($price_mod->amount());
-                        ?>
+						$running_total = $ticket->base_price()->amount();
+					} else {
+						$running_total = 0;
+					}
+					$pretax_total     = $running_total;
+					$display_subtotal = true;
+					// now add price modifiers
+					foreach ($ticket->price_modifiers() as $price_mod) {
+						if ($price_mod->is_tax()) {
+							echo espressoSubtotalRow($running_total, $display_subtotal);
+							$display_subtotal = false;
+							$new_sub_total    = $pretax_total * ($price_mod->amount() / 100);
+						} elseif ($price_mod->is_percent()) {
+							$new_sub_total = $running_total * ($price_mod->amount() / 100);
+						} else {
+							$new_sub_total = $price_mod->amount();
+						}
+						$new_sub_total = $price_mod->is_discount()
+							? $new_sub_total * -1
+							: $new_sub_total;
+						$description   = $price_mod->desc() . ' ';
+						$description   .= $price_mod->is_percent()
+							? $price_mod->amount() . '%'
+							: EEH_Template::format_currency($price_mod->amount());
+						?>
                         <tr>
                             <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>"
                                 class="jst-rght small-text"
@@ -102,17 +102,17 @@ 
                             </td>
                             <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>" class="jst-rght small-text">
                                 <?php echo wp_kses(
-                                        EEH_Template::format_currency($new_sub_total),
-                                        AllowedTags::getAllowedTags()
-                                    ); ?>
+										EEH_Template::format_currency($new_sub_total),
+										AllowedTags::getAllowedTags()
+									); ?>
                             </td>
                             <?php $pretax_total += ! $price_mod->is_tax() ? $new_sub_total : 0; ?>
                             <?php $running_total += $new_sub_total; ?>
                         </tr>
                     <?php } ?>
                     <?php if ($ticket->taxable()) {
-                        echo espressoSubtotalRow($running_total);
-                        foreach ($ticket->get_ticket_taxes_for_admin() as $tax) { ?>
+						echo espressoSubtotalRow($running_total);
+						foreach ($ticket->get_ticket_taxes_for_admin() as $tax) { ?>
                             <tr>
                                 <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>"
                                     class="jst-rght small-text"
@@ -129,9 +129,9 @@ 
                                     class="jst-rght small-text"
                                 >
                                     <?php echo wp_kses(
-                                        EEH_Template::format_currency($tax_amount),
-                                        AllowedTags::getAllowedTags()
-                                    ); ?>
+										EEH_Template::format_currency($tax_amount),
+										AllowedTags::getAllowedTags()
+									); ?>
                                 </td>
                                 <?php $running_total += $tax_amount; ?>
                             </tr>
@@ -141,24 +141,24 @@ 
                         <td colspan="2" class="jst-rght small-text ttl-lbl-td">
                             <b>
                                 <?php echo esc_html(
-                                    apply_filters(
-                                        'FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                                        __('Total', 'event_espresso')
-                                    )
-                                ); ?>
+									apply_filters(
+										'FHEE__ticket_selector_chart_template__ticket_details_total_price',
+										__('Total', 'event_espresso')
+									)
+								); ?>
                             </b>
                         </td>
                         <td data-th="<?php echo esc_html(
-                            apply_filters(
-                                'FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                                __('Total', 'event_espresso')
-                            )
-                        ); ?>" class="jst-rght small-text"
+							apply_filters(
+								'FHEE__ticket_selector_chart_template__ticket_details_total_price',
+								__('Total', 'event_espresso')
+							)
+						); ?>" class="jst-rght small-text"
                         >
                             <b><?php  wp_kses(
-                                EEH_Template::format_currency($running_total),
-                                AllowedTags::getAllowedTags()
-                            ); ?></b>
+								EEH_Template::format_currency($running_total),
+								AllowedTags::getAllowedTags()
+							); ?></b>
                         </td>
                     </tr>
                 </tbody>

admin_pages/registration_form/espresso_events_Registration_Form_Hooks.class.php

Indentation +203 added lines, -203 removed lines

@@ -15,102 +15,102 @@ 
  */
 class espresso_events_Registration_Form_Hooks extends EE_Admin_Hooks
 {
-    /**
-     * @var EE_Event|null
-     */
-    protected $_event;
-
-
-    protected function _set_hooks_properties()
-    {
-        $this->_name = 'registration_form';
-        if (
-            $this->_adminpage_obj->adminConfig()->useAdvancedEditor()
-            && $this->_adminpage_obj->feature()->allowed('use_reg_form_builder')
-        ) {
-            $this->_metaboxes      = [];
-            $this->_scripts_styles = [];
-            return;
-        }
-        $this->_metaboxes = [
-            0 => [
-                'page_route' => ['edit', 'create_new'],
-                'func'       => 'primary_questions',
-                'label'      => esc_html__('Questions for Primary Registrant', 'event_espresso'),
-                'priority'   => 'default',
-                'context'    => 'side',
-            ],
-        ];
-
-        // hook into the handler for saving question groups
-        add_filter(
-            'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-            [$this, 'modify_callbacks'],
-            10
-        );
-
-        // hook into revision restores (we're hooking into the global action because EE_Admin_Hooks classes are already
-        // restricted by page)
-        add_action('AHEE_EE_Admin_Page_CPT__restore_revision', [$this, 'restore_revision'], 10, 2);
-    }
-
-
-    /**
-     * Callback for FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks hook
-     *
-     * @param $callbacks
-     * @return array
-     */
-    public function modify_callbacks($callbacks)
-    {
-        // now let's add the question group callback
-        $callbacks['primary_question_group_update'] = [$this, 'primary_question_group_update'];
-        return $callbacks;
-    }
-
-
-    /**
-     * Hooked into revision restores.
-     *
-     * @param $post_id
-     * @param $revision_id
-     * @return EE_Base_Class
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function restore_revision($post_id, $revision_id)
-    {
-        $post_evt = EEM_Event::instance()->get_one_by_ID($post_id);
-        // restore revision for primary questions
-        if ($post_evt instanceof EE_Event) {
-            $post_evt->restore_revision(
-                $revision_id,
-                ['Question_Group'],
-                ['Question_Group' => ['Event_Question_Group.EQG_primary' => true]]
-            );
-        }
-        return $post_evt;
-    }
-
-
-    /**
-     * Content of metabox.
-     *
-     * @param $post_id
-     * @param $post
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function primary_questions($post_id, $post)
-    {
-        $this->_event = $this->_adminpage_obj->get_event_object();
-        $event_id     = $this->_event->ID();
-        ?>
+	/**
+	 * @var EE_Event|null
+	 */
+	protected $_event;
+
+
+	protected function _set_hooks_properties()
+	{
+		$this->_name = 'registration_form';
+		if (
+			$this->_adminpage_obj->adminConfig()->useAdvancedEditor()
+			&& $this->_adminpage_obj->feature()->allowed('use_reg_form_builder')
+		) {
+			$this->_metaboxes      = [];
+			$this->_scripts_styles = [];
+			return;
+		}
+		$this->_metaboxes = [
+			0 => [
+				'page_route' => ['edit', 'create_new'],
+				'func'       => 'primary_questions',
+				'label'      => esc_html__('Questions for Primary Registrant', 'event_espresso'),
+				'priority'   => 'default',
+				'context'    => 'side',
+			],
+		];
+
+		// hook into the handler for saving question groups
+		add_filter(
+			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
+			[$this, 'modify_callbacks'],
+			10
+		);
+
+		// hook into revision restores (we're hooking into the global action because EE_Admin_Hooks classes are already
+		// restricted by page)
+		add_action('AHEE_EE_Admin_Page_CPT__restore_revision', [$this, 'restore_revision'], 10, 2);
+	}
+
+
+	/**
+	 * Callback for FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks hook
+	 *
+	 * @param $callbacks
+	 * @return array
+	 */
+	public function modify_callbacks($callbacks)
+	{
+		// now let's add the question group callback
+		$callbacks['primary_question_group_update'] = [$this, 'primary_question_group_update'];
+		return $callbacks;
+	}
+
+
+	/**
+	 * Hooked into revision restores.
+	 *
+	 * @param $post_id
+	 * @param $revision_id
+	 * @return EE_Base_Class
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function restore_revision($post_id, $revision_id)
+	{
+		$post_evt = EEM_Event::instance()->get_one_by_ID($post_id);
+		// restore revision for primary questions
+		if ($post_evt instanceof EE_Event) {
+			$post_evt->restore_revision(
+				$revision_id,
+				['Question_Group'],
+				['Question_Group' => ['Event_Question_Group.EQG_primary' => true]]
+			);
+		}
+		return $post_evt;
+	}
+
+
+	/**
+	 * Content of metabox.
+	 *
+	 * @param $post_id
+	 * @param $post
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function primary_questions($post_id, $post)
+	{
+		$this->_event = $this->_adminpage_obj->get_event_object();
+		$event_id     = $this->_event->ID();
+		?>
         <div class="inside">
             <p>
                 <strong>
@@ -118,64 +118,64 @@ 
                 </strong>
                 <br />
                 <?php
-                printf(
-                    esc_html__(
-                        'Add a pre-populated %1$sgroup of questions%2$s to your event. The personal information group is required for all events',
-                        'event_espresso'
-                    ),
-                    '<a href="admin.php?page=espresso_registration_form" target="_blank">',
-                    '</a>'
-                )
-                ?>
+				printf(
+					esc_html__(
+						'Add a pre-populated %1$sgroup of questions%2$s to your event. The personal information group is required for all events',
+						'event_espresso'
+					),
+					'<a href="admin.php?page=espresso_registration_form" target="_blank">',
+					'</a>'
+				)
+				?>
             </p>
             <?php
 
-            $qsg_where['QSG_deleted'] = false;
-            $query_params             = apply_filters(
-                'FHEE__espresso_events_Registration_Form_Hooks__primary_questions__question_group_query_parameters',
-                [$qsg_where, 'order_by' => ['QSG_order' => 'ASC']]
-            );
-            $QSGs                     = EEM_Question_Group::instance()->get_all($query_params);
-            $EQGs                     = ! empty($event_id)
-                ? $this->_event->get_many_related(
-                    'Question_Group',
-                    [['Event_Question_Group.EQG_primary' => true]]
-                )
-                : [];
-            $EQGids                   = array_keys($EQGs);
-
-            if (! empty($QSGs)) {
-                $html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
-                foreach ($QSGs as $QSG) {
-                    $QSG_ID          = absint($QSG->ID());
-                    $checked         = in_array($QSG_ID, $EQGids, true) || $QSG->get('QSG_system') === 1
-                        ? ' checked'
-                        : '';
-                    $visibility      = $QSG->get('QSG_system') === 1
-                        ? ' style="visibility:hidden"'
-                        : '';
-                    $edit_query_args = $this->_adminpage_obj->is_caf()
-                        ? [
-                            'action' => 'edit_question_group',
-                            'QSG_ID' => $QSG_ID,
-                        ]
-                        : ['action' => 'question_groups'];
-                    $edit_link       = EE_Admin_Page::add_query_args_and_nonce(
-                        $edit_query_args,
-                        EE_FORMS_ADMIN_URL
-                    );
-                    $edit_link_title = sprintf(
-                        esc_attr__('Edit %s Group', 'event_espresso'),
-                        $QSG->get('QSG_name')
-                    );
-
-                    $html .= '
+			$qsg_where['QSG_deleted'] = false;
+			$query_params             = apply_filters(
+				'FHEE__espresso_events_Registration_Form_Hooks__primary_questions__question_group_query_parameters',
+				[$qsg_where, 'order_by' => ['QSG_order' => 'ASC']]
+			);
+			$QSGs                     = EEM_Question_Group::instance()->get_all($query_params);
+			$EQGs                     = ! empty($event_id)
+				? $this->_event->get_many_related(
+					'Question_Group',
+					[['Event_Question_Group.EQG_primary' => true]]
+				)
+				: [];
+			$EQGids                   = array_keys($EQGs);
+
+			if (! empty($QSGs)) {
+				$html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : '';
+				foreach ($QSGs as $QSG) {
+					$QSG_ID          = absint($QSG->ID());
+					$checked         = in_array($QSG_ID, $EQGids, true) || $QSG->get('QSG_system') === 1
+						? ' checked'
+						: '';
+					$visibility      = $QSG->get('QSG_system') === 1
+						? ' style="visibility:hidden"'
+						: '';
+					$edit_query_args = $this->_adminpage_obj->is_caf()
+						? [
+							'action' => 'edit_question_group',
+							'QSG_ID' => $QSG_ID,
+						]
+						: ['action' => 'question_groups'];
+					$edit_link       = EE_Admin_Page::add_query_args_and_nonce(
+						$edit_query_args,
+						EE_FORMS_ADMIN_URL
+					);
+					$edit_link_title = sprintf(
+						esc_attr__('Edit %s Group', 'event_espresso'),
+						$QSG->get('QSG_name')
+					);
+
+					$html .= '
 					<p id="event-question-group-' . $QSG_ID . '">
 						<input value="' . $QSG_ID . '"
 						    type="checkbox"
 						    name="question_groups[' . $QSG_ID . ']" '
-                            . $visibility
-                            . $checked . '
+							. $visibility
+							. $checked . '
                         />
 						<a href="' . esc_url_raw($edit_link) . '"
 						    title="' . esc_attr($edit_link_title) . '"
@@ -184,62 +184,62 @@ 
 						    ' . $QSG->get('QSG_name') . '
                         </a>
 					</p>';
-                }
-                $html .= count($QSGs) > 10 ? '</div>' : '';
-                echo wp_kses($html, AllowedTags::getWithFormTags());
-            } else {
-                esc_html_e(
-                    'There seems to be a problem with your questions. Please contact support@eventespresso.com',
-                    'event_espresso'
-                );
-            }
-            do_action('AHEE_event_editor_questions_notice');
-            ?>
+				}
+				$html .= count($QSGs) > 10 ? '</div>' : '';
+				echo wp_kses($html, AllowedTags::getWithFormTags());
+			} else {
+				esc_html_e(
+					'There seems to be a problem with your questions. Please contact support@eventespresso.com',
+					'event_espresso'
+				);
+			}
+			do_action('AHEE_event_editor_questions_notice');
+			?>
         </div>
         <?php
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @param array    $data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function primary_question_group_update($event, $data)
-    {
-        $question_groups = ! empty($data['question_groups']) ? (array) $data['question_groups'] : [];
-        $added_qgs       = array_keys($question_groups);
-        $success         = true;
-
-        // let's get all current question groups associated with this event.
-        $current_qgs = $event->get_many_related(
-            'Question_Group',
-            [['Event_Question_Group.EQG_primary' => true]]
-        );
-        $current_qgs = array_keys($current_qgs); // we just want the ids
-
-        // now let's get the groups selected in the editor and update (IF we have data)
-        if (! empty($question_groups)) {
-            foreach ($question_groups as $QSG_ID => $val) {
-                // add to event
-                if ($val) {
-                    $qg = $event->_add_relation_to($QSG_ID, 'Question_Group', ['EQG_primary' => true]);
-                }
-                // trip success to false if result is empty
-                $success = ! empty($qg) ? $success : false;
-            }
-        }
-
-        // wait a minute... are there question groups missing in the saved groups that ARE with the current event?
-        $removed_qgs = array_diff($current_qgs, $added_qgs);
-
-        foreach ($removed_qgs as $QSG_ID) {
-            $qg = $event->_remove_relation_to($QSG_ID, 'Question_Group', ['EQG_primary' => true]);
-            // trip success to false if result is empty
-            $success = ! empty($qg) ? $success : false;
-        }
-        return $success;
-    }
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @param array    $data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function primary_question_group_update($event, $data)
+	{
+		$question_groups = ! empty($data['question_groups']) ? (array) $data['question_groups'] : [];
+		$added_qgs       = array_keys($question_groups);
+		$success         = true;
+
+		// let's get all current question groups associated with this event.
+		$current_qgs = $event->get_many_related(
+			'Question_Group',
+			[['Event_Question_Group.EQG_primary' => true]]
+		);
+		$current_qgs = array_keys($current_qgs); // we just want the ids
+
+		// now let's get the groups selected in the editor and update (IF we have data)
+		if (! empty($question_groups)) {
+			foreach ($question_groups as $QSG_ID => $val) {
+				// add to event
+				if ($val) {
+					$qg = $event->_add_relation_to($QSG_ID, 'Question_Group', ['EQG_primary' => true]);
+				}
+				// trip success to false if result is empty
+				$success = ! empty($qg) ? $success : false;
+			}
+		}
+
+		// wait a minute... are there question groups missing in the saved groups that ARE with the current event?
+		$removed_qgs = array_diff($current_qgs, $added_qgs);
+
+		foreach ($removed_qgs as $QSG_ID) {
+			$qg = $event->_remove_relation_to($QSG_ID, 'Question_Group', ['EQG_primary' => true]);
+			// trip success to false if result is empty
+			$success = ! empty($qg) ? $success : false;
+		}
+		return $success;
+	}
 }

admin_pages/registration_form/templates/questions_main_meta_box.template.php

Indentation +139 added lines, -139 removed lines

@@ -30,23 +30,23 @@ 
 global $allowedposttags;
 $info_box = '';
 if ($QST_system === 'country') {
-    // already escaped
-    $info_box = EEH_HTML::div(
-        EEH_HTML::h3(
-            '<span class="dashicons dashicons-info"></span> '
-            . esc_html__('Did you know...', 'event_espresso'),
-            '',
-            'ee-status--info'
-        ) .
-        EEH_HTML::p(
-            esc_html__(
-                'If you add a State/Province Select input immediately after this Country Select input when building your registration form, then the State/Province Select input options will change to correspond with the choice made in this input. So for example, choosing "United States" in this Country Select input will populate the State/Province Select input with just the state options for the United States.',
-                'event_espresso'
-            )
-        ),
-        '',
-        'ee-info-box'
-    );
+	// already escaped
+	$info_box = EEH_HTML::div(
+		EEH_HTML::h3(
+			'<span class="dashicons dashicons-info"></span> '
+			. esc_html__('Did you know...', 'event_espresso'),
+			'',
+			'ee-status--info'
+		) .
+		EEH_HTML::p(
+			esc_html__(
+				'If you add a State/Province Select input immediately after this Country Select input when building your registration form, then the State/Province Select input options will change to correspond with the choice made in this input. So for example, choosing "United States" in this Country Select input will populate the State/Province Select input with just the state options for the United States.',
+				'event_espresso'
+			)
+		),
+		'',
+		'ee-info-box'
+	);
 }
 ?>
 
@@ -82,9 +82,9 @@ 
                     </th>
                     <td>
                         <?php
-                        $id            = ! empty($QST_system) ? '_disabled' : '';
-                        $disabled_attr = ! empty($QST_system) ? 'disabled' : '';
-                        ?>
+						$id            = ! empty($QST_system) ? '_disabled' : '';
+						$disabled_attr = ! empty($QST_system) ? 'disabled' : '';
+						?>
                         <input id="QST_admin_label<?php echo esc_attr($id); ?>"
                                name="QST_admin_label<?php echo esc_attr($id); ?>"
                                type="text"
@@ -122,29 +122,29 @@ 
                     </th>
                     <td>
                         <?php
-                        $id            = ! empty($QST_system) ? '_disabled' : '';
-                        $disabled_attr = ! empty($QST_system) ? 'disabled' : '';
-                        $admin_only    = $question->get('QST_admin_only');
-                        $checked       = ! empty($admin_only) ? ' checked' : '';
-                        ?>
+						$id            = ! empty($QST_system) ? '_disabled' : '';
+						$disabled_attr = ! empty($QST_system) ? 'disabled' : '';
+						$admin_only    = $question->get('QST_admin_only');
+						$checked       = ! empty($admin_only) ? ' checked' : '';
+						?>
                         <input class="QST_admin_only"
                                id="QST_admin_only<?php echo esc_attr($id); ?>"
                                name="QST_admin_only<?php echo esc_attr($id); ?>"
                                type="checkbox"
                                value="1"
                             <?php
-                            echo esc_attr($disabled_attr);
-                            echo esc_attr($checked);
-                            ?>
+							echo esc_attr($disabled_attr);
+							echo esc_attr($checked);
+							?>
                         />
                         <br />
                             <?php
-                            if (! empty($QST_system)) { ?>
+							if (! empty($QST_system)) { ?>
                                 <p class="description" style="color:#D54E21;">
                                     <?php esc_html_e(
-                                        'System question! This field cannot be changed.',
-                                        'event_espresso'
-                                    ); ?>
+										'System question! This field cannot be changed.',
+										'event_espresso'
+									); ?>
                                 </p>
                             <?php } ?>
                     </td>
@@ -159,44 +159,44 @@ 
                     </th>
                     <td>
                         <?php
-                        $disabled = ! empty($QST_system) && $QST_system !== EEM_Attendee::system_question_phone;
-                        if ($disabled) {
-                            $disabled_attr = 'disabled="disabled"';
-                            $id            = '_disabled';
-                        } else {
-                            $disabled_attr = '';
-                            $id            = '';
-                        }
+						$disabled = ! empty($QST_system) && $QST_system !== EEM_Attendee::system_question_phone;
+						if ($disabled) {
+							$disabled_attr = 'disabled="disabled"';
+							$id            = '_disabled';
+						} else {
+							$disabled_attr = '';
+							$id            = '';
+						}
 
-                        // Only display Confirm email for
-                        if (empty($QST_system) || $QST_system !== EEM_Attendee::system_question_email_confirm) {
-                            unset($question_types[ EEM_Question::QST_type_email_confirm ]);
-                        }
+						// Only display Confirm email for
+						if (empty($QST_system) || $QST_system !== EEM_Attendee::system_question_email_confirm) {
+							unset($question_types[ EEM_Question::QST_type_email_confirm ]);
+						}
 
-                        echo EEH_Form_Fields::select_input(
-                            'QST_type' . $id,
-                            $question_types,
-                            $question->type(),
-                            'id="QST_type' . $id . '"' . $disabled_attr
-                        ); // already escaped
-                        if ($disabled) { ?>
+						echo EEH_Form_Fields::select_input(
+							'QST_type' . $id,
+							$question_types,
+							$question->type(),
+							'id="QST_type' . $id . '"' . $disabled_attr
+						); // already escaped
+						if ($disabled) { ?>
                             <input id='QST_type'
                                    name="QST_type"
                                    type="hidden"
                                    value="<?php echo esc_attr($question->type()); ?>"
                             />
                             <?php
-                            $explanatory_text = esc_html__(
-                                'System question! This field cannot be changed.',
-                                'event_espresso'
-                            );
-                        } else {
-                            $explanatory_text = esc_html__(
-                                'Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.',
-                                'event_espresso'
-                            );
-                        }
-                        if ($disabled || $has_answers) { ?>
+							$explanatory_text = esc_html__(
+								'System question! This field cannot be changed.',
+								'event_espresso'
+							);
+						} else {
+							$explanatory_text = esc_html__(
+								'Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.',
+								'event_espresso'
+							);
+						}
+						if ($disabled || $has_answers) { ?>
                             <p class="description" style="color:#D54E21;">
                                     <?php echo esc_html($explanatory_text); ?>
                             </p>
@@ -224,21 +224,21 @@ 
                         <p>
                             <span class="description">
                                 <?php esc_html_e(
-                                    'Maximum number of characters allowed when answering this question',
-                                    'event_espresso'
-                                ); ?>
+									'Maximum number of characters allowed when answering this question',
+									'event_espresso'
+								); ?>
                             </span>
                         </p>
                         <?php if ($QST_system) { ?>
                         <p>
                             <span class="description" style="color:#D54E21;">
                                 <?php printf(
-                                    esc_html__(
-                                        'System question! The maximum number of characters that can be used for this question is %1$s',
-                                        'event_espresso'
-                                    ),
-                                    $max_max
-                                ); ?>
+									esc_html__(
+										'System question! The maximum number of characters that can be used for this question is %1$s',
+										'event_espresso'
+									),
+									$max_max
+								); ?>
                             </span>
                         </p>
                         <?php } ?>
@@ -263,9 +263,9 @@ 
                                     <th class="option-desc-header">
                                         <label>
                                         <?php esc_html_e(
-                                            'Description (optional, only shown on registration form)',
-                                            'event_espresso'
-                                        ) ?>
+											'Description (optional, only shown on registration form)',
+											'event_espresso'
+										) ?>
                                         </label>
                                     </th>
                                     <th>
@@ -308,9 +308,9 @@ 
                                         </a>
                                         <a class="button button--icon-only sortable-drag-handle ee-aria-tooltip"
                                             aria-label="<?php esc_html_e(
-                                                'click and drag to change the order of this option',
-                                                'event_espresso'
-                                            ) ?>"
+												'click and drag to change the order of this option',
+												'event_espresso'
+											) ?>"
                                         >
                                             <span class='dashicons dashicons-image-flip-vertical '></span>
                                         </a>
@@ -318,14 +318,14 @@ 
                                 </tr>
 
                                 <?php
-                                $count            = 0;
-                                $question_options = $question->options();
-                                if (! empty($question_options)) {
-                                    foreach ($question_options as $option_id => $option) {
-                                        $disabled_attr = $has_answers || $option->get('QSO_system')
-                                            ? 'disabled'
-                                            : '';
-                                        ?>
+								$count            = 0;
+								$question_options = $question->options();
+								if (! empty($question_options)) {
+									foreach ($question_options as $option_id => $option) {
+										$disabled_attr = $has_answers || $option->get('QSO_system')
+											? 'disabled'
+											: '';
+										?>
                                         <tr class="question-option ee-options-sortable">
                                             <td class="option-value-cell">
                                                 <label class='screen-reader-text'
@@ -375,29 +375,29 @@ 
                                             <?php } ?>
                                                 <a class='button button--icon-only sortable-drag-handle ee-aria-tooltip'
                                                    aria-label="<?php esc_html_e(
-                                                       'click and drag to change the order of this option',
-                                                       'event_espresso'
-                                                   ) ?>"
+													   'click and drag to change the order of this option',
+													   'event_espresso'
+												   ) ?>"
                                                 >
                                                     <span class='dashicons dashicons-image-flip-vertical '></span>
                                                 </a>
                                             <?php
-                                            echo EEH_Form_Fields::hidden_input(
-                                                "question_options[{$count}][QST_ID])",
-                                                $option->question_ID()
-                                            ); // already escaped
-                                            echo EEH_Form_Fields::hidden_input(
-                                                "question_options[{$count}][QSO_ID])",
-                                                $option->ID()
-                                            ); // already escaped
-                                            $count++;
-                                            ?>
+											echo EEH_Form_Fields::hidden_input(
+												"question_options[{$count}][QST_ID])",
+												$option->question_ID()
+											); // already escaped
+											echo EEH_Form_Fields::hidden_input(
+												"question_options[{$count}][QSO_ID])",
+												$option->ID()
+											); // already escaped
+											$count++;
+											?>
                                             </td>
                                         </tr>
                                         <?php
-                                    }
-                                } else {
-                                    ?>
+									}
+								} else {
+									?>
                                     <tr class="question-option ee-options-sortable">
                                         <td class="option-value-cell">
                                             <input type="text"
@@ -421,8 +421,8 @@ 
                                         </td>
                                     </tr>
                                     <?php
-                                }
-                                ?>
+								}
+								?>
                             </tbody>
                         </table>
                         <div class="ee-admin-button-row">
@@ -430,24 +430,24 @@ 
                                 <?php esc_html_e('Add Another Answer Option', 'event_espresso') ?>
                             </a>
                             <?php echo EEH_Form_Fields::hidden_input(
-                                'question_options_count',
-                                $count
-                            ); // already escaped ?>
+								'question_options_count',
+								$count
+							); // already escaped ?>
                         </div>
                         <br />
 
                         <p class="description">
                             <?php esc_html_e(
-                                'Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.',
-                                'event_espresso'
-                            ) ?>
+								'Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.',
+								'event_espresso'
+							) ?>
                         </p>
                         <?php if ($has_answers) : ?>
                             <p class="description" style="color:#D54E21;">
                                 <?php esc_html_e(
-                                    'Answer values that are uneditable are this way because there are registrations in the database that have answers for this question.  If you need to correct a mistake, or edit an existing option value, then trash the existing one and create a new option with the changes.  This will ensure that the existing registrations that chose the original answer will preserve that answer.',
-                                    'event_espresso'
-                                ); ?>
+									'Answer values that are uneditable are this way because there are registrations in the database that have answers for this question.  If you need to correct a mistake, or edit an existing option value, then trash the existing one and create a new option with the changes.  This will ensure that the existing registrations that chose the original answer will preserve that answer.',
+									'event_espresso'
+								); ?>
                             </p>
                         <?php endif; ?>
                     </td>
@@ -462,38 +462,38 @@ 
                     </th>
                     <td>
                         <?php
-                        $system_required   = ['fname', 'email'];
-                        $disabled_attr     = in_array($QST_system, $system_required) ? ' disabled="disabled"' : '';
-                        $required_on       = $question->get('QST_admin_only');
-                        $show_required_msg = $required_on ? '' : ' display:none;';
-                        $disabled_attr     = $required_on || ! empty($disabled_attr) ? ' disabled="disabled"' : '';
-                        $id                =
-                            ! empty($disabled_attr) && in_array($QST_system, $system_required) ? '_disabled' : '';
-                        $requiredOptions   = [
-                            ['text' => esc_html__('Optional', 'event_espresso'), 'id' => 0],
-                            ['text' => esc_html__('Required', 'event_espresso'), 'id' => 1],
-                        ];
-                        echo EEH_Form_Fields::select_input(
-                            'QST_required' . $id,
-                            $requiredOptions,
-                            $question->required(),
-                            'id="QST_required' . $id . '"' . $disabled_attr,
-                            'ee-input-width--small'
-                        ); // already escaped
-                        ?>
+						$system_required   = ['fname', 'email'];
+						$disabled_attr     = in_array($QST_system, $system_required) ? ' disabled="disabled"' : '';
+						$required_on       = $question->get('QST_admin_only');
+						$show_required_msg = $required_on ? '' : ' display:none;';
+						$disabled_attr     = $required_on || ! empty($disabled_attr) ? ' disabled="disabled"' : '';
+						$id                =
+							! empty($disabled_attr) && in_array($QST_system, $system_required) ? '_disabled' : '';
+						$requiredOptions   = [
+							['text' => esc_html__('Optional', 'event_espresso'), 'id' => 0],
+							['text' => esc_html__('Required', 'event_espresso'), 'id' => 1],
+						];
+						echo EEH_Form_Fields::select_input(
+							'QST_required' . $id,
+							$requiredOptions,
+							$question->required(),
+							'id="QST_required' . $id . '"' . $disabled_attr,
+							'ee-input-width--small'
+						); // already escaped
+						?>
                         <p id="required_toggled_on" class="description"
                                   style="color:#D54E21;<?php echo esc_attr($show_required_msg); ?>"
                             >
                                 <?php esc_html_e(
-                                    'Required is set to optional, and this field is disabled, because the question is Admin-Only.',
-                                    'event_espresso'
-                                ) ?>
+									'Required is set to optional, and this field is disabled, because the question is Admin-Only.',
+									'event_espresso'
+								) ?>
                         </p>
                         <p id="required_toggled_off" class="description" style="color:#D54E21; display: none;">
                                 <?php esc_html_e(
-                                    'Required option field is no longer disabled because the question is not Admin-Only',
-                                    'event_espresso'
-                                ) ?>
+									'Required option field is no longer disabled because the question is not Admin-Only',
+									'event_espresso'
+								) ?>
                         </p>
                         <?php if (! empty($disabled_attr) && in_array($QST_system, $system_required)) { ?>
                             <input id="QST_required"
@@ -527,8 +527,8 @@ 
                     </td>
                 </tr>
                 <?php
-                do_action('AHEE__questions_main_meta_box__template__after_table_form_table', $question);
-                ?>
+				do_action('AHEE__questions_main_meta_box__template__after_table_form_table', $question);
+				?>
             </tbody>
         </table>
 

Spacing +13 added lines, -13 removed lines

@@ -37,7 +37,7 @@ 
             . esc_html__('Did you know...', 'event_espresso'),
             '',
             'ee-status--info'
-        ) .
+        ).
         EEH_HTML::p(
             esc_html__(
                 'If you add a State/Province Select input immediately after this Country Select input when building your registration form, then the State/Province Select input options will change to correspond with the choice made in this input. So for example, choosing "United States" in this Country Select input will populate the State/Province Select input with just the state options for the United States.',
@@ -91,7 +91,7 @@ 
                                value="<?php echo esc_attr($question->get_f('QST_admin_label')); ?>"
                                <?php echo esc_attr($disabled_attr); ?>
                         />
-                        <?php if (! empty($QST_system)) { ?>
+                        <?php if ( ! empty($QST_system)) { ?>
                             <input id='QST_admin_label'
                                    name="QST_admin_label"
                                    type="hidden"
@@ -99,7 +99,7 @@ 
                             />
                         <?php } ?>
                         <br />
-                        <?php if (! empty($QST_system)) { ?>
+                        <?php if ( ! empty($QST_system)) { ?>
                             <p class="description" style="color:#D54E21;">
                                 <?php esc_html_e('System question! This field cannot be changed.', 'event_espresso') ?>
                             </p>
@@ -139,7 +139,7 @@ 
                         />
                         <br />
                             <?php
-                            if (! empty($QST_system)) { ?>
+                            if ( ! empty($QST_system)) { ?>
                                 <p class="description" style="color:#D54E21;">
                                     <?php esc_html_e(
                                         'System question! This field cannot be changed.',
@@ -170,14 +170,14 @@ 
 
                         // Only display Confirm email for
                         if (empty($QST_system) || $QST_system !== EEM_Attendee::system_question_email_confirm) {
-                            unset($question_types[ EEM_Question::QST_type_email_confirm ]);
+                            unset($question_types[EEM_Question::QST_type_email_confirm]);
                         }
 
                         echo EEH_Form_Fields::select_input(
-                            'QST_type' . $id,
+                            'QST_type'.$id,
                             $question_types,
                             $question->type(),
-                            'id="QST_type' . $id . '"' . $disabled_attr
+                            'id="QST_type'.$id.'"'.$disabled_attr
                         ); // already escaped
                         if ($disabled) { ?>
                             <input id='QST_type'
@@ -214,7 +214,7 @@ 
                     </th>
                     <td>
                         <input id="QST_max"
-                            <?php echo ($max_max === EE_INF ? '' : 'max="' . esc_attr($max_max) . '"'); ?>
+                            <?php echo ($max_max === EE_INF ? '' : 'max="'.esc_attr($max_max).'"'); ?>
                                min="1"
                                name="QST_max"
                                type="number"
@@ -320,7 +320,7 @@ 
                                 <?php
                                 $count            = 0;
                                 $question_options = $question->options();
-                                if (! empty($question_options)) {
+                                if ( ! empty($question_options)) {
                                     foreach ($question_options as $option_id => $option) {
                                         $disabled_attr = $has_answers || $option->get('QSO_system')
                                             ? 'disabled'
@@ -366,7 +366,7 @@ 
                                                 />
                                             </td>
                                             <td>
-                                            <?php if (! $option->system()) { ?>
+                                            <?php if ( ! $option->system()) { ?>
                                                 <a class='button button--icon-only remove-option remove-item ee-aria-tooltip'
                                                    aria-label="<?php esc_html_e('click to delete this option', 'event_espresso') ?>"
                                                 >
@@ -474,10 +474,10 @@ 
                             ['text' => esc_html__('Required', 'event_espresso'), 'id' => 1],
                         ];
                         echo EEH_Form_Fields::select_input(
-                            'QST_required' . $id,
+                            'QST_required'.$id,
                             $requiredOptions,
                             $question->required(),
-                            'id="QST_required' . $id . '"' . $disabled_attr,
+                            'id="QST_required'.$id.'"'.$disabled_attr,
                             'ee-input-width--small'
                         ); // already escaped
                         ?>
@@ -495,7 +495,7 @@ 
                                     'event_espresso'
                                 ) ?>
                         </p>
-                        <?php if (! empty($disabled_attr) && in_array($QST_system, $system_required)) { ?>
+                        <?php if ( ! empty($disabled_attr) && in_array($QST_system, $system_required)) { ?>
                             <input id="QST_required"
                                    name="QST_required"
                                    type='hidden'

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Indentation +1405 added lines, -1405 removed lines

@@ -20,1422 +20,1422 @@
 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'),
-                    'order' => 50,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_critical_pages_help_tab' => [
-                        'title'    => esc_html__('Critical Pages', 'event_espresso'),
-                        'filename' => 'general_settings_critical_pages',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'default'               => [
-                'nav'           => [
-                    'label' => esc_html__('Your Organization', 'event_espresso'),
-                    'order' => 20,
-                ],
-                'help_tabs'     => [
-                    'general_settings_your_organization_help_tab' => [
-                        'title'    => esc_html__('Your Organization', 'event_espresso'),
-                        'filename' => 'general_settings_your_organization',
-                    ],
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'require_nonce' => false,
-            ],
-            'admin_option_settings' => [
-                'nav'           => [
-                    'label' => esc_html__('Admin Options', 'event_espresso'),
-                    'order' => 60,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_admin_options_help_tab' => [
-                        'title'    => esc_html__('Admin Options', 'event_espresso'),
-                        'filename' => 'general_settings_admin_options',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'country_settings'      => [
-                'nav'           => [
-                    'label' => esc_html__('Countries', 'event_espresso'),
-                    'order' => 70,
-                ],
-                'help_tabs'     => [
-                    'general_settings_countries_help_tab' => [
-                        'title'    => esc_html__('Countries', 'event_espresso'),
-                        'filename' => 'general_settings_countries',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'privacy_settings'      => [
-                'nav'           => [
-                    'label' => esc_html__('Privacy', 'event_espresso'),
-                    'order' => 80,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'require_nonce' => false,
-            ],
-        ];
-    }
-
-
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    /**
-     * Enqueue global scripts and styles for all routes in the General Settings Admin Pages.
-     */
-    public function load_scripts_styles()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        // scripts
-        wp_enqueue_script('ee_admin_js');
-    }
-
-
-    /**
-     * Execute logic running on `admin_init`
-     */
-    public function admin_init()
-    {
-        $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()
-    {
-        // 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);
-        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'),
+					'order' => 50,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_critical_pages_help_tab' => [
+						'title'    => esc_html__('Critical Pages', 'event_espresso'),
+						'filename' => 'general_settings_critical_pages',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'default'               => [
+				'nav'           => [
+					'label' => esc_html__('Your Organization', 'event_espresso'),
+					'order' => 20,
+				],
+				'help_tabs'     => [
+					'general_settings_your_organization_help_tab' => [
+						'title'    => esc_html__('Your Organization', 'event_espresso'),
+						'filename' => 'general_settings_your_organization',
+					],
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'require_nonce' => false,
+			],
+			'admin_option_settings' => [
+				'nav'           => [
+					'label' => esc_html__('Admin Options', 'event_espresso'),
+					'order' => 60,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_admin_options_help_tab' => [
+						'title'    => esc_html__('Admin Options', 'event_espresso'),
+						'filename' => 'general_settings_admin_options',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'country_settings'      => [
+				'nav'           => [
+					'label' => esc_html__('Countries', 'event_espresso'),
+					'order' => 70,
+				],
+				'help_tabs'     => [
+					'general_settings_countries_help_tab' => [
+						'title'    => esc_html__('Countries', 'event_espresso'),
+						'filename' => 'general_settings_countries',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'privacy_settings'      => [
+				'nav'           => [
+					'label' => esc_html__('Privacy', 'event_espresso'),
+					'order' => 80,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'require_nonce' => false,
+			],
+		];
+	}
+
+
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	/**
+	 * Enqueue global scripts and styles for all routes in the General Settings Admin Pages.
+	 */
+	public function load_scripts_styles()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		// scripts
+		wp_enqueue_script('ee_admin_js');
+	}
+
+
+	/**
+	 * Execute logic running on `admin_init`
+	 */
+	public function admin_init()
+	{
+		$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()
+	{
+		// 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);
+		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']
+		);
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -247,19 +247,19 @@ 
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(
+        EE_Registry::$i18n_js_strings['error_occurred'] = wp_strip_all_tags(
             esc_html__(
                 'An error occurred! Please refresh the page and try again.',
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(
+        EE_Registry::$i18n_js_strings['confirm_delete_state'] = wp_strip_all_tags(
             esc_html__(
                 'Are you sure you want to delete this State / Province?',
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
+        EE_Registry::$i18n_js_strings['ajax_url'] = admin_url(
             'admin-ajax.php?page=espresso_general_settings',
             is_ssl() ? 'https://' : 'http://'
         );
@@ -288,12 +288,12 @@ 
         wp_enqueue_script('thickbox');
         wp_register_script(
             'organization_settings',
-            GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+            GEN_SET_ASSETS_URL.'your_organization_settings.js',
             ['jquery', 'media-upload', 'thickbox'],
             EVENT_ESPRESSO_VERSION,
             true
         );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+        wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', [], EVENT_ESPRESSO_VERSION);
         wp_enqueue_script('organization_settings');
         wp_enqueue_style('organization-css');
         $confirm_image_delete = [
@@ -316,12 +316,12 @@ 
         // scripts
         wp_register_script(
             'gen_settings_countries',
-            GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+            GEN_SET_ASSETS_URL.'gen_settings_countries.js',
             ['ee_admin_js'],
             EVENT_ESPRESSO_VERSION,
             true
         );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+        wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', [], EVENT_ESPRESSO_VERSION);
         wp_enqueue_script('gen_settings_countries');
         wp_enqueue_style('organization-css');
     }
@@ -369,7 +369,7 @@ 
         $this->_set_add_edit_form_tags('update_espresso_page_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'espresso_page_settings.template.php',
             $this->_template_args,
             true
         );
@@ -385,12 +385,12 @@ 
     protected function _update_espresso_page_settings()
     {
         // capture incoming request data && set page IDs
-        $this->core_config->reg_page_id       = $this->request->getRequestParam(
+        $this->core_config->reg_page_id = $this->request->getRequestParam(
             'reg_page_id',
             $this->core_config->reg_page_id,
             DataType::INT
         );
-        $this->core_config->txn_page_id       = $this->request->getRequestParam(
+        $this->core_config->txn_page_id = $this->request->getRequestParam(
             'txn_page_id',
             $this->core_config->txn_page_id,
             DataType::INT
@@ -400,7 +400,7 @@ 
             $this->core_config->thank_you_page_id,
             DataType::INT
         );
-        $this->core_config->cancel_page_id    = $this->request->getRequestParam(
+        $this->core_config->cancel_page_id = $this->request->getRequestParam(
             'cancel_page_id',
             $this->core_config->cancel_page_id,
             DataType::INT
@@ -666,16 +666,16 @@ 
             $country->ID(),
             $country
         );
-        $this->_template_args['country_states_settings']  = $this->display_country_states(
+        $this->_template_args['country_states_settings'] = $this->display_country_states(
             $country->ID(),
             $country
         );
-        $this->_template_args['CNT_name_for_site']        = $country->name();
+        $this->_template_args['CNT_name_for_site'] = $country->name();
 
         $this->_set_add_edit_form_tags('update_country_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'countries_settings.template.php',
             $this->_template_args,
             true
         );
@@ -699,7 +699,7 @@ 
         $CNT_ISO          = $this->getCountryISO($CNT_ISO);
         $CNT_ISO_for_site = $this->getCountryIsoForSite();
 
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             return '';
         }
 
@@ -712,7 +712,7 @@ 
         $CNT_cur_disabled                         = $CNT_ISO !== $CNT_ISO_for_site;
         $this->_template_args['CNT_cur_disabled'] = $CNT_cur_disabled;
 
-        $country_input_types            = [
+        $country_input_types = [
             'CNT_active'      => [
                 'type'             => 'RADIO_BTN',
                 'input_name'       => "cntry[$CNT_ISO]",
@@ -837,8 +837,8 @@ 
             $country,
             $country_input_types
         );
-        $country_details_settings       = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
+        $country_details_settings = EEH_Template::display_template(
+            GEN_SET_TEMPLATE_PATH.'country_details_settings.template.php',
             $this->_template_args,
             true
         );
@@ -872,7 +872,7 @@ 
     public function display_country_states(string $CNT_ISO = '', ?EE_Country $country = null): string
     {
         $CNT_ISO = $this->getCountryISO($CNT_ISO);
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             return '';
         }
         // for ajax
@@ -948,7 +948,7 @@ 
         );
 
         $state_details_settings = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'state_details_settings.template.php',
             $this->_template_args,
             true
         );
@@ -980,7 +980,7 @@ 
     {
         $success = true;
         $CNT_ISO = $this->getCountryISO('');
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             EE_Error::add_error(
                 esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
                 __FILE__,
@@ -990,7 +990,7 @@ 
             $success = false;
         }
         $STA_abbrev = $this->request->getRequestParam('STA_abbrev');
-        if (! $STA_abbrev) {
+        if ( ! $STA_abbrev) {
             EE_Error::add_error(
                 esc_html__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
                 __FILE__,
@@ -1000,7 +1000,7 @@ 
             $success = false;
         }
         $STA_name = $this->request->getRequestParam('STA_name');
-        if (! $STA_name) {
+        if ( ! $STA_name) {
             EE_Error::add_error(
                 esc_html__('No State name or an invalid State name was received.', 'event_espresso'),
                 __FILE__,
@@ -1017,7 +1017,7 @@ 
                 'STA_name'   => $STA_name,
                 'STA_active' => true,
             ];
-            $success       = EEM_State::instance()->insert($cols_n_values);
+            $success = EEM_State::instance()->insert($cols_n_values);
             EE_Error::add_success(esc_html__('The State was added successfully.', 'event_espresso'));
         }
 
@@ -1049,7 +1049,7 @@ 
         $STA_ID     = $this->request->getRequestParam('STA_ID');
         $STA_abbrev = $this->request->getRequestParam('STA_abbrev');
 
-        if (! $STA_ID) {
+        if ( ! $STA_ID) {
             EE_Error::add_error(
                 esc_html__('No State ID or an invalid State ID was received.', 'event_espresso'),
                 __FILE__,
@@ -1093,7 +1093,7 @@ 
     protected function _update_country_settings()
     {
         $CNT_ISO = $this->getCountryISO();
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             EE_Error::add_error(
                 esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
                 __FILE__,
@@ -1117,15 +1117,15 @@ 
                 $country->currency_code()
             )
         );
-        $cols_n_values['CNT_cur_single']  = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_single'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_single]",
             $country->currency_name_single()
         );
-        $cols_n_values['CNT_cur_plural']  = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_plural'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_plural]",
             $country->currency_name_plural()
         );
-        $cols_n_values['CNT_cur_sign']    = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_sign'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_sign]",
             $country->currency_sign()
         );
@@ -1142,15 +1142,15 @@ 
             "cntry[$CNT_ISO][CNT_cur_dec_mrk]",
             $country->currency_decimal_mark()
         );
-        $cols_n_values['CNT_cur_thsnds']  = $this->request->getRequestParam(
+        $cols_n_values['CNT_cur_thsnds'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_cur_thsnds]",
             $country->currency_thousands_separator()
         );
-        $cols_n_values['CNT_tel_code']    = $this->request->getRequestParam(
+        $cols_n_values['CNT_tel_code'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_tel_code]",
             $country->telephoneCode()
         );
-        $cols_n_values['CNT_active']      = $this->request->getRequestParam(
+        $cols_n_values['CNT_active'] = $this->request->getRequestParam(
             "cntry[$CNT_ISO][CNT_active]",
             $country->isActive(),
             DataType::BOOL
@@ -1173,7 +1173,7 @@ 
             $this->request->getRequestParam('states', [], DataType::STRING, true)
         );
 
-        if (! empty($states) && $success !== false) {
+        if ( ! empty($states) && $success !== false) {
             // loop thru state data ( looks like : states[75][STA_name] )
             foreach ($states as $STA_ID => $state) {
                 $cols_n_values = [
@@ -1231,7 +1231,7 @@ 
         return '
 			<tr>
 				<th>
-					' . $label . '
+					' . $label.'
 				</th>';
     }
 
@@ -1246,7 +1246,7 @@ 
     {
         return '
 				<td class="general-settings-country-input-td">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
     }
@@ -1275,7 +1275,7 @@ 
     {
         return '
 				<td class="general-settings-country-state-input-td">
-					' . $input . '
+					' . $input.'
 				</td>';
     }
 
@@ -1295,9 +1295,9 @@ 
             ['post' => $ee_page_id, 'action' => 'edit'],
             admin_url('post.php')
         );
-        $links    = '<a href="' . esc_url_raw($edit_url) . '" >' . esc_html__('Edit', 'event_espresso') . '</a>';
+        $links = '<a href="'.esc_url_raw($edit_url).'" >'.esc_html__('Edit', 'event_espresso').'</a>';
         $links    .= ' &nbsp;|&nbsp; ';
-        $links    .= '<a href="' . get_permalink($ee_page_id) . '" >' . esc_html__('View', 'event_espresso') . '</a>';
+        $links    .= '<a href="'.get_permalink($ee_page_id).'" >'.esc_html__('View', 'event_espresso').'</a>';
 
         return $links;
     }
@@ -1331,8 +1331,8 @@ 
         }
 
         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>';
+        <span class="ee-page-status ' . $pg_class.'"><strong>'.$pg_status.'</strong></span>
+        <span class="ee-page-status ' . $sc_class.'"><strong>'.$sc_status.'</strong></span>';
     }
 
 
@@ -1352,7 +1352,7 @@ 
         bool $echo = true
     ): string {
         global $wpdb;
-        $items  = $wpdb->get_results(
+        $items = $wpdb->get_results(
             $wpdb->prepare(
                 "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
                 $parent
@@ -1367,8 +1367,8 @@ 
                 $post_title = wp_strip_all_tags($item->post_title);
                 $pad    = str_repeat('&nbsp;', $level * 3);
                 $option = "\n\t";
-                $option .= '<option class="level-' . $level . '" ';
-                $option .= 'value="' . $ID . '" ';
+                $option .= '<option class="level-'.$level.'" ';
+                $option .= 'value="'.$ID.'" ';
                 $option .= $ID === absint($default) ? ' selected' : '';
                 $option .= '>';
                 $option .= "$pad {$post_title}";

admin_pages/transactions/templates/txn_admin_details_main_meta_box_attendees.template.php

Indentation +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@
                             <td class="jst-rght"><?php echo wp_kses($attendee['ticket_price'], AllowedTags::getAllowedTags()); ?></td>
                             <td class="jst-left">
                                 <?php
-                                $att_link = EE_Admin_Page::add_query_args_and_nonce(
-                                    ['action' => 'view_registration', '_REG_ID' => $registration],
-                                    REG_ADMIN_URL
-                                );
-                                ?>
+								$att_link = EE_Admin_Page::add_query_args_and_nonce(
+									['action' => 'view_registration', '_REG_ID' => $registration],
+									REG_ADMIN_URL
+								);
+								?>
                                 <a href="<?php echo esc_url_raw($att_link); ?>"
                                    title="<?php esc_attr_e('View details for this registrant', 'event_espresso'); ?>"
                                 >

admin_pages/transactions/templates/txn_admin_details_header.template.php

Indentation +8 added lines, -8 removed lines

@@ -18,14 +18,14 @@
 <div class="ee-admin-page-nav-strip-wrap">
     <div class='ee-admin-page-nav-strip'>
     <?php
-    echo wp_kses($previous_transaction, AllowedTags::getAllowedTags());
-    echo '&nbsp;' . sprintf(
-        /* translators: %s: transaction number */
-        esc_html__('Transaction # %1$s', 'event_espresso'),
-        esc_html($txn_nmbr['value'])
-    ) . '&nbsp;';
-    echo wp_kses($next_transaction, AllowedTags::getAllowedTags());
-    ?>
+	echo wp_kses($previous_transaction, AllowedTags::getAllowedTags());
+	echo '&nbsp;' . sprintf(
+		/* translators: %s: transaction number */
+		esc_html__('Transaction # %1$s', 'event_espresso'),
+		esc_html($txn_nmbr['value'])
+	) . '&nbsp;';
+	echo wp_kses($next_transaction, AllowedTags::getAllowedTags());
+	?>
     </div>
 </div>
 

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
     <div class='ee-admin-page-nav-strip'>
     <?php
     echo wp_kses($previous_transaction, AllowedTags::getAllowedTags());
-    echo '&nbsp;' . sprintf(
+    echo '&nbsp;'.sprintf(
         /* translators: %s: transaction number */
         esc_html__('Transaction # %1$s', 'event_espresso'),
         esc_html($txn_nmbr['value'])
-    ) . '&nbsp;';
+    ).'&nbsp;';
     echo wp_kses($next_transaction, AllowedTags::getAllowedTags());
     ?>
     </div>

admin_pages/transactions/templates/txn_admin_details_main_meta_box_txn_details.template.php

Indentation +170 added lines, -170 removed lines

@@ -83,21 +83,21 @@ 
     </div>
     <br class="clear" />
     <?php
-    $no_payments = $grand_raw_total > 0
-                   || $TXN_status !== EEM_Transaction::complete_status_code
-                   || ! empty($payments);
-    ?>
+	$no_payments = $grand_raw_total > 0
+				   || $TXN_status !== EEM_Transaction::complete_status_code
+				   || ! empty($payments);
+	?>
     <?php if ($attendee instanceof EE_Attendee && $no_payments) : ?>
         <?php $no_payment_text = $can_edit_payments
-            ? esc_html__(
-                'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.',
-                'event_espresso'
-            )
-            : esc_html__(
-                'No payments have been applied to this transaction yet.',
-                'event_espresso'
-            );
-        ?>
+			? esc_html__(
+				'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.',
+				'event_espresso'
+			)
+			: esc_html__(
+				'No payments have been applied to this transaction yet.',
+				'event_espresso'
+			);
+		?>
 
         <h3 class="admin-primary-mbox-h4 hdr-has-icon">
             <?php esc_html_e('Payment Details', 'event_espresso'); ?>
@@ -143,13 +143,13 @@ 
                     <?php if ($payments) : ?>
                         <?php $payment_total = 0; ?>
                         <?php foreach ($payments as $PAY_ID => $payment) :
-                            if (! $payment instanceof EE_Payment) {
-                                continue;
-                            }
-                            $existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
-                                ? wp_json_encode($existing_reg_payments[ $PAY_ID ])
-                                : '{}';
-                            ?>
+							if (! $payment instanceof EE_Payment) {
+								continue;
+							}
+							$existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
+								? wp_json_encode($existing_reg_payments[ $PAY_ID ])
+								: '{}';
+							?>
                             <tr id="txn-admin-payment-tr-<?php echo absint($PAY_ID); ?>" class=' jst-cntr'>
                                 <td class="jst-cntr no-pad">
                                     <span id="payment-status-<?php echo absint($PAY_ID); ?>"
@@ -173,20 +173,20 @@ 
                                 </td>
                                 <td class=' jst-rght'>
                                     <?php
-                                    $payment_class = $payment->amount() > 0
-                                        ? 'txn-admin-payment-status-' . $payment->STS_ID()
-                                        : 'txn-admin-payment-status-PDC';
-                                    ?>
+									$payment_class = $payment->amount() > 0
+										? 'txn-admin-payment-status-' . $payment->STS_ID()
+										: 'txn-admin-payment-status-PDC';
+									?>
                                     <span class="<?php echo esc_attr($payment_class); ?>">
                                         <span id="payment-amount-<?php echo $escaped_pay_id; ?>"
                                               style="display:inline;"
                                         >
                                         <?php echo EEH_Template::format_currency(
-                                            $payment->amount(),
-                                            false,
-                                            false
-                                        ); // already escaped
-                                        ?>
+											$payment->amount(),
+											false,
+											false
+										); // already escaped
+										?>
                                         </span>
                                     </span>
                                 </td>
@@ -197,13 +197,13 @@ 
                                     <span class="ee-status--ignore">&raquo;</span>
                                     <span id="payment-gateway-<?php echo absint($PAY_ID); ?>">
                                         <?php echo ($payment->payment_method() instanceof EE_Payment_Method
-                                            ? esc_html($payment->payment_method()->admin_name())
-                                            : esc_html__("Unknown", 'event_espresso')); ?>
+											? esc_html($payment->payment_method()->admin_name())
+											: esc_html__("Unknown", 'event_espresso')); ?>
                                     </span>
                                     <span id="payment-gateway-id-<?php echo absint($PAY_ID); ?>" class="hidden">
                                         <?php echo ($payment->payment_method() instanceof EE_Payment_Method
-                                            ? esc_html($payment->payment_method()->ID())
-                                            : 0); ?>
+											? esc_html($payment->payment_method()->ID())
+											: 0); ?>
                                     </span>
                                 </td>
                                 <td class=" jst-left">
@@ -228,18 +228,18 @@ 
                                 </td>
                                 <td class=" jst-rght">
                                     <?php
-                                    $payment_class = $payment->amount() > 0
-                                        ? 'txn-admin-payment-status-' . $payment->STS_ID()
-                                        : 'txn-admin-payment-status-PDC';
-                                    ?>
+									$payment_class = $payment->amount() > 0
+										? 'txn-admin-payment-status-' . $payment->STS_ID()
+										: 'txn-admin-payment-status-PDC';
+									?>
                                     <span class="<?php echo esc_attr($payment_class); ?>">
                                         <span id="payment-amount-<?php echo absint($PAY_ID); ?>" style="display:inline;">
                                         <?php echo EEH_Template::format_currency(
-                                            $payment->amount(),
-                                            false,
-                                            false
-                                        ); // already escaped
-                                        ?>
+											$payment->amount(),
+											false,
+											false
+										); // already escaped
+										?>
                                         </span>
                                     </span>
                                 </td>
@@ -271,9 +271,9 @@ 
                             <?php $payment_total += $payment->STS_ID() == 'PAP' ? $payment->amount() : 0; ?>
                         <?php endforeach; ?>
                         <?php $pay_totals_class = $payment_total > $grand_raw_total
-                            ? ' important-notice'
-                            : '';
-                        ?>
+							? ' important-notice'
+							: '';
+						?>
                         <tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
                             <td class=" jst-rght" colspan="10">
                                 <span class="important-notice"><?php echo wp_kses($no_payment_text, AllowedTags::getAllowedTags()); ?></span>
@@ -285,27 +285,27 @@ 
                             <th class=" jst-rght" colspan="9">
                         <span id="payments-total-spn">
                         <?php
-                        $overpaid = $payment_total > $grand_raw_total
-                            ? '<span id="overpaid">'
-                              . __('This transaction has been overpaid ! ', 'event_espresso')
-                              . '</span>'
-                            : '';
-                        echo $overpaid . esc_html(
-                            sprintf(
-                                __('Payments Total %s', 'event_espresso'),
-                                '(' . EE_Registry::instance()->CFG->currency->code . ')'
-                            )
-                        ); ?>
+						$overpaid = $payment_total > $grand_raw_total
+							? '<span id="overpaid">'
+							  . __('This transaction has been overpaid ! ', 'event_espresso')
+							  . '</span>'
+							: '';
+						echo $overpaid . esc_html(
+							sprintf(
+								__('Payments Total %s', 'event_espresso'),
+								'(' . EE_Registry::instance()->CFG->currency->code . ')'
+							)
+						); ?>
                         </span>
                             </th>
                             <th class=" jst-rght">
                         <span id="txn-admin-payment-total">
                         <?php
-                        echo EEH_Template::format_currency(
-                            $payment_total,
-                            false,
-                            false
-                        ); // already escaped ?>
+						echo EEH_Template::format_currency(
+							$payment_total,
+							false,
+							false
+						); // already escaped ?>
                         </span>
                             </th>
                         </tr>
@@ -406,15 +406,15 @@ 
                 </span>
             <?php endif; ?>
             <?php
-            // Allows extend the fields at actions area.
-            ob_start();
-            do_action(
-                'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
-                $can_edit_payments
-            );
-            $extra_actions = ob_get_clean();
-            echo str_replace(['<li', '</li>'], ['<span', '</span>'], $extra_actions);
-            ?>
+			// Allows extend the fields at actions area.
+			ob_start();
+			do_action(
+				'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
+				$can_edit_payments
+			);
+			$extra_actions = ob_get_clean();
+			echo str_replace(['<li', '</li>'], ['<span', '</span>'], $extra_actions);
+			?>
         </div>
 
         <div id="txn-admin-apply-payment-dv" class="txn-admin-payment-option auto-hide" style="display: none;">
@@ -430,23 +430,23 @@ 
                 style="display:none;"
             >
                 <?php
-                printf(
-                    esc_html__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
-                    '<span class="ee-admin-payment-id"></span>',
-                    $txn_nmbr['value']
-                );
-                ?>
+				printf(
+					esc_html__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
+					'<span class="ee-admin-payment-id"></span>',
+					$txn_nmbr['value']
+				);
+				?>
                 <span class='dashicons dashicons-money-alt'></span>
             </h2>
 
             <h2 id="admin-modal-dialog-edit-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
                 <?php
-                printf(
-                    esc_html__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
-                    '<span class="ee-admin-payment-id"></span>',
-                    $txn_nmbr['value']
-                );
-                ?>
+				printf(
+					esc_html__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
+					'<span class="ee-admin-payment-id"></span>',
+					$txn_nmbr['value']
+				);
+				?>
                 <span class='dashicons dashicons-money-alt'></span>
             </h2>
 
@@ -454,9 +454,9 @@ 
                 style="display:none;"
             >
                 <?php
-                echo esc_html__('Apply a Refund to Transaction #', 'event_espresso');
-                echo esc_html($txn_nmbr['value']);
-                ?>
+				echo esc_html__('Apply a Refund to Transaction #', 'event_espresso');
+				echo esc_html($txn_nmbr['value']);
+				?>
                 <span class='dashicons dashicons-money-alt'></span>
             </h2>
 
@@ -570,20 +570,20 @@ 
                                             <?php echo esc_attr($selected); ?>
                                         >
                                             <?php
-                                            echo esc_html(
-                                                sanitize_key($method->admin_desc())
-                                                    ? substr($method->admin_desc(), 0, 128)
-                                                    : $method->admin_name()
-                                            );
-                                            ?>&nbsp;&nbsp;
+											echo esc_html(
+												sanitize_key($method->admin_desc())
+													? substr($method->admin_desc(), 0, 128)
+													: $method->admin_name()
+											);
+											?>&nbsp;&nbsp;
                                         </option>
                                     <?php endforeach; ?>
                                 </select>
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash',
-                                        'event_espresso'
-                                    ); ?>
+										'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -592,9 +592,9 @@ 
                         admin-modal-dialog-row ee-layout-row">
                             <label for="txn-admin-payment-txn-id-chq-nmbr-inp" class="">
                                 <?php esc_html_e(
-                                    'TXN ID / CHQ #',
-                                    'event_espresso'
-                                ); ?>
+									'TXN ID / CHQ #',
+									'event_espresso'
+								); ?>
                             </label>
                             <div class='ee-layout-stack'>
                                 <input name="txn_admin_payment[txn_id_chq_nmbr]"
@@ -604,9 +604,9 @@ 
                                 />
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'The Transaction ID sent back from the payment gateway, or the Cheque #',
-                                        'event_espresso'
-                                    ); ?>
+										'The Transaction ID sent back from the payment gateway, or the Cheque #',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -624,9 +624,9 @@ 
                                 />
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'The gateway response string (optional)',
-                                        'event_espresso'
-                                    ); ?>
+										'The gateway response string (optional)',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -635,9 +635,9 @@ 
                             ee-layout-row">
                             <label for="txn-admin-payment-status-slct" class="">
                                 <?php esc_html_e(
-                                    'Payment Status',
-                                    'event_espresso'
-                                ); ?>
+									'Payment Status',
+									'event_espresso'
+								); ?>
                             </label>
                             <div class='ee-layout-stack'>
                                 <select name="txn_admin_payment[status]"
@@ -647,10 +647,10 @@ 
                                 >
                                     <?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
                                         <?php
-                                        $selected = $STS_ID == 'PAP'
-                                            ? 'selected'
-                                            : '';
-                                        ?>
+										$selected = $STS_ID == 'PAP'
+											? 'selected'
+											: '';
+										?>
                                         <option id="payment-status-opt-<?php echo esc_attr($STS_ID); ?>"
                                                 value="<?php echo esc_attr($STS_ID); ?>"
                                             <?php echo esc_attr($selected); ?>
@@ -661,10 +661,10 @@ 
                                 </select>
                                 <p class="description">
                                     <?php
-                                    esc_html_e(
-                                        'Whether the payment was approved, cancelled, declined or failed after submission to the gateway',
-                                        'event_espresso'
-                                    ); ?>
+									esc_html_e(
+										'Whether the payment was approved, cancelled, declined or failed after submission to the gateway',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -682,9 +682,9 @@ 
                                 />
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'The Purchase or Sales Order Number if any (optional)',
-                                        'event_espresso'
-                                    ); ?>
+										'The Purchase or Sales Order Number if any (optional)',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -707,9 +707,9 @@ 
                                 />
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.',
-                                        'event_espresso'
-                                    ); ?>
+										'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -748,9 +748,9 @@ 
                                 <?php echo wp_kses($status_change_select, AllowedTags::getWithFormTags()); ?>
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'If you wish to change the status for the registrations selected above, then select which status from this dropdown.',
-                                        'event_espresso'
-                                    ); ?>
+										'If you wish to change the status for the registrations selected above, then select which status from this dropdown.',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -781,14 +781,14 @@ 
                                 <br class="clear-float" />
                                 <p class="description">
                                     <?php printf(
-                                        esc_html__(
-                                            'By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.',
-                                            'event_espresso'
-                                        ),
-                                        '<strong>',
-                                        '</strong>',
-                                        '<br />'
-                                    ); ?>
+										esc_html__(
+											'By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.',
+											'event_espresso'
+										),
+										'<strong>',
+										'</strong>',
+										'<br />'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -843,10 +843,10 @@ 
                 style="display:none;"
             >
                 <?php printf(
-                    esc_html__('Delete Payment/Refund for Transaction #', 'event_espresso'),
-                    $txn_nmbr['value']
-                );
-                ?>
+					esc_html__('Delete Payment/Refund for Transaction #', 'event_espresso'),
+					$txn_nmbr['value']
+				);
+				?>
                 <span class='dashicons dashicons-money-alt'></span>
             </h2>
 
@@ -886,13 +886,13 @@ 
                                 <?php echo wp_kses($delete_status_change_select, AllowedTags::getWithFormTags()); ?>
                                 <p class="description">
                                     <?php printf(
-                                        esc_html__(
-                                            'If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s',
-                                            'event_espresso'
-                                        ),
-                                        '<strong>',
-                                        '</strong>'
-                                    ); ?>
+										esc_html__(
+											'If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s',
+											'event_espresso'
+										),
+										'<strong>',
+										'</strong>'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -909,10 +909,10 @@ 
                                 />
                                 <p class="description">
                                     <?php
-                                    esc_html_e(
-                                        'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.',
-                                        'event_espresso'
-                                    ); ?>
+									esc_html_e(
+										'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -940,8 +940,8 @@ 
     <?php endif; // $grand_raw_total > 0?>
 
     <?php if (WP_DEBUG) {
-        $delivered_messages = get_option('EED_Messages__payment', []);
-        if (isset($delivered_messages[ $TXN_ID ])) { ?>
+		$delivered_messages = get_option('EED_Messages__payment', []);
+		if (isset($delivered_messages[ $TXN_ID ])) { ?>
             <h4 class="admin-primary-mbox-h4 hdr-has-icon">
                 <?php esc_html_e('Messages Sent to Primary Registrant', 'event_espresso'); ?>
                 <span class="dashicons dashicons-email-alt"></span>
@@ -953,39 +953,39 @@ 
                             <th class="jst-left"><?php esc_html_e('Date & Time', 'event_espresso'); ?></th>
                             <th class="jst-left"><?php esc_html_e('Message Type', 'event_espresso'); ?></th>
                             <th class="jst-left"><?php esc_html_e(
-                                'Payment Status Upon Sending',
-                                'event_espresso'
-                            ); ?></th>
+								'Payment Status Upon Sending',
+								'event_espresso'
+							); ?></th>
                             <th class="jst-left"><?php esc_html_e('TXN Status Upon Sending', 'event_espresso'); ?></th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php
-                        foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
-                            ?>
+						foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
+							?>
                             <tr>
                                 <td class="jst-left">
                                     <?php echo esc_html(
-                                        date(
-                                            get_option('date_format') . ' ' . get_option('time_format'),
-                                            ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
-                                        )
-                                    ); ?>
+										date(
+											get_option('date_format') . ' ' . get_option('time_format'),
+											($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
+										)
+									); ?>
                                 </td>
                                 <td class="jst-left"><?php
-                                    echo isset($delivered_message['message_type'])
-                                        ? esc_html($delivered_message['message_type'])
-                                        : ''; ?>
+									echo isset($delivered_message['message_type'])
+										? esc_html($delivered_message['message_type'])
+										: ''; ?>
                                 </td>
                                 <td class="jst-left"><?php
-                                    echo isset($delivered_message['pay_status'])
-                                        ? esc_html($delivered_message['pay_status'])
-                                        : ''; ?>
+									echo isset($delivered_message['pay_status'])
+										? esc_html($delivered_message['pay_status'])
+										: ''; ?>
                                 </td>
                                 <td class="jst-left"><?php
-                                    echo isset($delivered_message['txn_status'])
-                                        ? esc_html($delivered_message['txn_status'])
-                                        : ''; ?>
+									echo isset($delivered_message['txn_status'])
+										? esc_html($delivered_message['txn_status'])
+										: ''; ?>
                                 </td>
                             </tr>
                         <?php endforeach; // $delivered_messages?>
@@ -993,7 +993,7 @@ 
                 </table>
             </div>
             <?php
-        }
-    }
-    ?>
+		}
+	}
+	?>
 </div>

Braces +10 added lines, -4 removed lines

@@ -309,10 +309,13 @@ 
                         </span>
                             </th>
                         </tr>
-                    <?php else : ?>
+                    <?php else {
+	: ?>
                         <tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
                             <td class=" jst-rght" colspan="10">
-                                <span class="important-notice"><?php echo wp_kses($no_payment_text, AllowedTags::getAllowedTags()); ?></span>
+                                <span class="important-notice"><?php echo wp_kses($no_payment_text, AllowedTags::getAllowedTags());
+}
+?></span>
                             </td>
                         </tr>
                         <tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
@@ -400,9 +403,12 @@ 
                 >  <!--display-the-hidden -->
                     <?php esc_html_e('Apply Refund', 'event_espresso'); ?>
                 </a>
-            <?php else : ?>
+            <?php else {
+	: ?>
                 <span>
-                    <?php esc_html__('You do not have access to apply payments or refunds.', 'event_espresso'); ?>
+                    <?php esc_html__('You do not have access to apply payments or refunds.', 'event_espresso');
+}
+?>
                 </span>
             <?php endif; ?>
             <?php

admin_pages/transactions/templates/txn_admin_details_side_meta_box_registrant.template.php

Spacing +4 added lines, -4 removed lines

@@ -18,12 +18,12 @@ 
 $avatar = get_avatar_url($prime_reg_email);
 ?>
 <div id="admin-side-mbox-primary-registrant-dv" class="admin-side-mbox-dv">
-<?php if (! empty($no_attendee_message)) : ?>
+<?php if ( ! empty($no_attendee_message)) : ?>
     <div>
         <?php echo esc_html($no_attendee_message); ?>
     </div>
 <?php else : ?>
-    <?php if (! empty($avatar)) : ?>
+    <?php if ( ! empty($avatar)) : ?>
     <div class="ee-admin-attendee-avatar">
         <img alt="profile pic for <?php echo esc_html($attendee_full_name); ?>" src="<?php echo esc_url_raw($avatar); ?>" />
     </div>
@@ -40,7 +40,7 @@ 
                 </a>
             </div>
         </div>
-        <?php if (! empty($prime_reg_phone)) : ?>
+        <?php if ( ! empty($prime_reg_phone)) : ?>
             <div class='ee-admin-attendee-phone'>
                 <div class='ee-admin-contact-details-with-dashicon'>
                     <span class='dashicons dashicons-phone'></span>
@@ -50,7 +50,7 @@ 
                 </div>
             </div>
         <?php endif; ?>
-        <?php if (! empty($formatted_address)) : ?>
+        <?php if ( ! empty($formatted_address)) : ?>
         <div class='ee-admin-attendee-address'>
             <div class='ee-admin-contact-details-with-dashicon'>
                 <span class='dashicons dashicons-location'></span>

Braces +5 added lines, -2 removed lines

@@ -22,10 +22,13 @@
     <div>
         <?php echo esc_html($no_attendee_message); ?>
     </div>
-<?php else : ?>
+<?php else {
+	: ?>
     <?php if (! empty($avatar)) : ?>
     <div class="ee-admin-attendee-avatar">
-        <img alt="profile pic for <?php echo esc_html($attendee_full_name); ?>" src="<?php echo esc_url_raw($avatar); ?>" />
+        <img alt="profile pic for <?php echo esc_html($attendee_full_name);
+}
+?>" src="<?php echo esc_url_raw($avatar); ?>" />
     </div>
     <?php endif; ?>
     <div class='admin-side-mbox-text-dv'>