eventespresso / event-espresso-core

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 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>
@@ -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>

admin_pages/registrations/EE_Registrations_List_Table.class.php

Indentation +1026 added lines, -1026 removed lines

@@ -14,595 +14,595 @@ 
  */
 class EE_Registrations_List_Table extends EE_Admin_List_Table
 {
-    /**
-     * @var Registrations_Admin_Page
-     */
-    protected $_admin_page;
-
-    /**
-     * @var RegistrationsListTableUserCapabilities
-     */
-    protected $caps_handler;
-
-    /**
-     * @var array
-     */
-    private $_status;
-
-    /**
-     * An array of transaction details for the related transaction to the registration being processed.
-     * This is set via the _set_related_details method.
-     *
-     * @var array
-     */
-    protected $_transaction_details = [];
-
-    /**
-     * An array of event details for the related event to the registration being processed.
-     * This is set via the _set_related_details method.
-     *
-     * @var array
-     */
-    protected $_event_details = [];
-
-
-    /**
-     * @param Registrations_Admin_Page $admin_page
-     */
-    public function __construct(Registrations_Admin_Page $admin_page)
-    {
-        $this->caps_handler = new RegistrationsListTableUserCapabilities(EE_Registry::instance()->CAP);
-        $req_data = $admin_page->get_request_data();
-        if (! empty($req_data['event_id'])) {
-            $extra_query_args = [];
-            foreach ($admin_page->get_views() as $view_details) {
-                $extra_query_args[ $view_details['slug'] ] = ['event_id' => $req_data['event_id']];
-            }
-            $this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
-        }
-        parent::__construct($admin_page);
-        $this->_status = $this->_admin_page->get_registration_status_array();
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    protected function _setup_data()
-    {
-        $this->_data           = $this->_admin_page->get_registrations($this->_per_page);
-        $this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, true);
-    }
-
-
-    /**
-     * @return void
-     */
-    protected function _set_properties()
-    {
-        $return_url          = $this->getReturnUrl();
-        $this->_wp_list_args = [
-            'singular' => esc_html__('registration', 'event_espresso'),
-            'plural'   => esc_html__('registrations', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        ];
-        $req_data            = $this->_admin_page->get_request_data();
-        if (isset($req_data['event_id'])) {
-            $this->_columns        = [
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                'id'               => esc_html__('ID', 'event_espresso'),
-                'ATT_fname'        => esc_html__('Name', 'event_espresso'),
-                'ATT_email'        => esc_html__('Email', 'event_espresso'),
-                '_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
-                'PRC_amount'       => esc_html__('TKT Price', 'event_espresso'),
-                '_REG_final_price' => esc_html__('Final Price', 'event_espresso'),
-                'TXN_total'        => esc_html__('Total Txn', 'event_espresso'),
-                'TXN_paid'         => esc_html__('Paid', 'event_espresso'),
-                'actions'          => $this->actionsColumnHeader(),
-            ];
-            $this->_bottom_buttons = [
-                'report' => [
-                    'route'         => 'registrations_report',
-                    'extra_request' => [
-                        'EVT_ID'     => $this->_req_data['event_id'] ?? null,
-                        'return_url' => $return_url,
-                    ],
-                ],
-            ];
-        } else {
-            $this->_columns        = [
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                'id'               => esc_html__('ID', 'event_espresso'),
-                'ATT_fname'        => esc_html__('Name', 'event_espresso'),
-                '_REG_date'        => esc_html__('TXN Date', 'event_espresso'),
-                'event_name'       => esc_html__('Event', 'event_espresso'),
-                'DTT_EVT_start'    => esc_html__('Event Date', 'event_espresso'),
-                '_REG_final_price' => esc_html__('Price', 'event_espresso'),
-                '_REG_paid'        => esc_html__('Paid', 'event_espresso'),
-                'actions'          => $this->actionsColumnHeader(),
-            ];
-            $this->_bottom_buttons = [
-                'report_all' => [
-                    'route'         => 'registrations_report',
-                    'extra_request' => [
-                        'return_url' => $return_url,
-                    ],
-                ],
-            ];
-        }
-        $this->_bottom_buttons['report_filtered'] = [
-            'route'         => 'registrations_report',
-            'extra_request' => [
-                'use_filters' => true,
-                'return_url'  => $return_url,
-            ],
-        ];
-        $filters                                  = array_diff_key(
-            $this->_req_data,
-            array_flip(
-                [
-                    'page',
-                    'action',
-                    'default_nonce',
-                ]
-            )
-        );
-        if (! empty($filters)) {
-            $this->_bottom_buttons['report_filtered']['extra_request']['filters'] = $filters;
-        }
-        $this->_primary_column   = 'id';
-        $this->_sortable_columns = [
-            '_REG_date'     => ['_REG_date' => true],   // true means its already sorted
-            /**
-             * Allows users to change the default sort if they wish.
-             * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
-             * name.
-             */
-            'ATT_fname'     => [
-                'FHEE__EE_Registrations_List_Table___set_properties__default_sort_by_registration_last_name',
-                true,
-                $this,
-            ]
-                ? ['ATT_lname' => false]
-                : ['ATT_fname' => false],
-            'event_name'    => ['event_name' => false],
-            'DTT_EVT_start' => ['DTT_EVT_start' => false],
-            'id'            => ['REG_ID' => false],
-        ];
-        $this->_hidden_columns   = [];
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param EE_Registration $item the current item
-     * @return string
-     */
-    protected function _get_row_class($item): string
-    {
-        $class = parent::_get_row_class($item);
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * Set the $_transaction_details property if not set yet.
-     *
-     * @param EE_Registration $registration
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _set_related_details(EE_Registration $registration)
-    {
-        $transaction                = $registration->get_first_related('Transaction');
-        $status                     = $transaction instanceof EE_Transaction
-            ? $transaction->status_ID()
-            : EEM_Transaction::failed_status_code;
-        $this->_transaction_details = [
-            'transaction' => $transaction,
-            'status'      => $status,
-            'id'          => $transaction instanceof EE_Transaction
-                ? $transaction->ID()
-                : 0,
-            'title_attr'  => sprintf(
-                esc_html__('View Transaction Details (%s)', 'event_espresso'),
-                EEH_Template::pretty_status($status, false, 'sentence')
-            ),
-        ];
-        try {
-            $event = $registration->event();
-        } catch (EntityNotFoundException $e) {
-            $event = null;
-        }
-        $status               = $event instanceof EE_Event
-            ? $event->get_active_status()
-            : EE_Datetime::inactive;
-        $this->_event_details = [
-            'event'      => $event,
-            'status'     => $status,
-            'id'         => $event instanceof EE_Event
-                ? $event->ID()
-                : 0,
-            'title_attr' => sprintf(
-                esc_html__('Edit Event (%s)', 'event_espresso'),
-                EEH_Template::pretty_status($status, false, 'sentence')
-            ),
-        ];
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _get_table_filters(): array
-    {
-        $filters = [];
-        // todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as
-        // methods.
-        $cur_date     = $this->_req_data['month_range'] ?? '';
-        $cur_category = $this->_req_data['EVT_CAT'] ?? -1;
-        $reg_status   = $this->_req_data['_reg_status'] ?? '';
-        $filters[]    = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
-        $filters[]    = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
-        $status       = [];
-        $status[]     = ['id' => 0, 'text' => esc_html__('Select Status', 'event_espresso')];
-        foreach ($this->_status as $key => $value) {
-            $status[] = ['id' => $key, 'text' => $value];
-        }
-        if ($this->_view !== 'incomplete') {
-            $filters[] = EEH_Form_Fields::select_input(
-                '_reg_status',
-                $status,
-                isset($this->_req_data['_reg_status'])
-                    ? strtoupper(sanitize_key($this->_req_data['_reg_status']))
-                    : ''
-            );
-        }
-        if (isset($this->_req_data['event_id'])) {
-            $filters[] = EEH_Form_Fields::hidden_input('event_id', $this->_req_data['event_id'], 'reg_event_id');
-        }
-        return $filters;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count']   = $this->_total_registrations();
-        $this->_views['month']['count'] = $this->_total_registrations_this_month();
-        $this->_views['today']['count'] = $this->_total_registrations_today();
-        if ($this->caps_handler->userCanTrashRegistrations()) {
-            $this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
-            $this->_views['trash']['count']      = $this->_total_registrations('trash');
-        }
-    }
-
-
-    /**
-     * @param string $view
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _total_registrations(string $view = ''): int
-    {
-        $_where = [];
-        $EVT_ID = isset($this->_req_data['event_id'])
-            ? absint($this->_req_data['event_id'])
-            : false;
-        if ($EVT_ID) {
-            $_where['EVT_ID'] = $EVT_ID;
-        }
-        switch ($view) {
-            case 'trash':
-                return EEM_Registration::instance()->count_deleted([$_where]);
-            case 'incomplete':
-                $_where['STS_ID'] = EEM_Registration::status_id_incomplete;
-                break;
-            default:
-                $_where['STS_ID'] = ['!=', EEM_Registration::status_id_incomplete];
-        }
-        return EEM_Registration::instance()->count([$_where]);
-    }
-
-
-    /**
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _total_registrations_this_month(): int
-    {
-        $EVT_ID          = isset($this->_req_data['event_id'])
-            ? absint($this->_req_data['event_id'])
-            : false;
-        $_where          = $EVT_ID
-            ? ['EVT_ID' => $EVT_ID]
-            : [];
-        $this_year_r     = date('Y', current_time('timestamp'));
-        $time_start      = ' 00:00:00';
-        $time_end        = ' 23:59:59';
-        $this_month_r    = date('m', current_time('timestamp'));
-        $days_this_month = date('t', current_time('timestamp'));
-        // setup date query.
-        $beginning_string   = EEM_Registration::instance()->convert_datetime_for_query(
-            'REG_date',
-            $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
-            'Y-m-d H:i:s'
-        );
-        $end_string         = EEM_Registration::instance()->convert_datetime_for_query(
-            'REG_date',
-            $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
-            'Y-m-d H:i:s'
-        );
-        $_where['REG_date'] = [
-            'BETWEEN',
-            [
-                $beginning_string,
-                $end_string,
-            ],
-        ];
-        $_where['STS_ID']   = ['!=', EEM_Registration::status_id_incomplete];
-        return EEM_Registration::instance()->count([$_where]);
-    }
-
-
-    /**
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _total_registrations_today(): int
-    {
-        $EVT_ID             = isset($this->_req_data['event_id'])
-            ? absint($this->_req_data['event_id'])
-            : false;
-        $_where             = $EVT_ID
-            ? ['EVT_ID' => $EVT_ID]
-            : [];
-        $current_date       = date('Y-m-d', current_time('timestamp'));
-        $time_start         = ' 00:00:00';
-        $time_end           = ' 23:59:59';
-        $_where['REG_date'] = [
-            'BETWEEN',
-            [
-                EEM_Registration::instance()->convert_datetime_for_query(
-                    'REG_date',
-                    $current_date . $time_start,
-                    'Y-m-d H:i:s'
-                ),
-                EEM_Registration::instance()->convert_datetime_for_query(
-                    'REG_date',
-                    $current_date . $time_end,
-                    'Y-m-d H:i:s'
-                ),
-            ],
-        ];
-        $_where['STS_ID']   = ['!=', EEM_Registration::status_id_incomplete];
-        return EEM_Registration::instance()->count([$_where]);
-    }
-
-
-    /**
-     * @param EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_cb($item): string
-    {
-        /** checkbox/lock **/
-        $REG_ID        = $item->ID();
-        $transaction   = $item->get_first_related('Transaction');
-        $payment_count = $transaction instanceof EE_Transaction
-            ? $transaction->count_related('Payment')
-            : 0;
-
-        $content = '<input type="checkbox" name="_REG_ID[]" value="' . $REG_ID . '" />';
-        $content .= $payment_count > 0 || ! $this->caps_handler->userCanEditRegistration($item)
-            ? '<span class="ee-locked-entity dashicons dashicons-lock ee-aria-tooltip ee-aria-tooltip--big-box" 
+	/**
+	 * @var Registrations_Admin_Page
+	 */
+	protected $_admin_page;
+
+	/**
+	 * @var RegistrationsListTableUserCapabilities
+	 */
+	protected $caps_handler;
+
+	/**
+	 * @var array
+	 */
+	private $_status;
+
+	/**
+	 * An array of transaction details for the related transaction to the registration being processed.
+	 * This is set via the _set_related_details method.
+	 *
+	 * @var array
+	 */
+	protected $_transaction_details = [];
+
+	/**
+	 * An array of event details for the related event to the registration being processed.
+	 * This is set via the _set_related_details method.
+	 *
+	 * @var array
+	 */
+	protected $_event_details = [];
+
+
+	/**
+	 * @param Registrations_Admin_Page $admin_page
+	 */
+	public function __construct(Registrations_Admin_Page $admin_page)
+	{
+		$this->caps_handler = new RegistrationsListTableUserCapabilities(EE_Registry::instance()->CAP);
+		$req_data = $admin_page->get_request_data();
+		if (! empty($req_data['event_id'])) {
+			$extra_query_args = [];
+			foreach ($admin_page->get_views() as $view_details) {
+				$extra_query_args[ $view_details['slug'] ] = ['event_id' => $req_data['event_id']];
+			}
+			$this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
+		}
+		parent::__construct($admin_page);
+		$this->_status = $this->_admin_page->get_registration_status_array();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function _setup_data()
+	{
+		$this->_data           = $this->_admin_page->get_registrations($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, true);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	protected function _set_properties()
+	{
+		$return_url          = $this->getReturnUrl();
+		$this->_wp_list_args = [
+			'singular' => esc_html__('registration', 'event_espresso'),
+			'plural'   => esc_html__('registrations', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		];
+		$req_data            = $this->_admin_page->get_request_data();
+		if (isset($req_data['event_id'])) {
+			$this->_columns        = [
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'id'               => esc_html__('ID', 'event_espresso'),
+				'ATT_fname'        => esc_html__('Name', 'event_espresso'),
+				'ATT_email'        => esc_html__('Email', 'event_espresso'),
+				'_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
+				'PRC_amount'       => esc_html__('TKT Price', 'event_espresso'),
+				'_REG_final_price' => esc_html__('Final Price', 'event_espresso'),
+				'TXN_total'        => esc_html__('Total Txn', 'event_espresso'),
+				'TXN_paid'         => esc_html__('Paid', 'event_espresso'),
+				'actions'          => $this->actionsColumnHeader(),
+			];
+			$this->_bottom_buttons = [
+				'report' => [
+					'route'         => 'registrations_report',
+					'extra_request' => [
+						'EVT_ID'     => $this->_req_data['event_id'] ?? null,
+						'return_url' => $return_url,
+					],
+				],
+			];
+		} else {
+			$this->_columns        = [
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'id'               => esc_html__('ID', 'event_espresso'),
+				'ATT_fname'        => esc_html__('Name', 'event_espresso'),
+				'_REG_date'        => esc_html__('TXN Date', 'event_espresso'),
+				'event_name'       => esc_html__('Event', 'event_espresso'),
+				'DTT_EVT_start'    => esc_html__('Event Date', 'event_espresso'),
+				'_REG_final_price' => esc_html__('Price', 'event_espresso'),
+				'_REG_paid'        => esc_html__('Paid', 'event_espresso'),
+				'actions'          => $this->actionsColumnHeader(),
+			];
+			$this->_bottom_buttons = [
+				'report_all' => [
+					'route'         => 'registrations_report',
+					'extra_request' => [
+						'return_url' => $return_url,
+					],
+				],
+			];
+		}
+		$this->_bottom_buttons['report_filtered'] = [
+			'route'         => 'registrations_report',
+			'extra_request' => [
+				'use_filters' => true,
+				'return_url'  => $return_url,
+			],
+		];
+		$filters                                  = array_diff_key(
+			$this->_req_data,
+			array_flip(
+				[
+					'page',
+					'action',
+					'default_nonce',
+				]
+			)
+		);
+		if (! empty($filters)) {
+			$this->_bottom_buttons['report_filtered']['extra_request']['filters'] = $filters;
+		}
+		$this->_primary_column   = 'id';
+		$this->_sortable_columns = [
+			'_REG_date'     => ['_REG_date' => true],   // true means its already sorted
+			/**
+			 * Allows users to change the default sort if they wish.
+			 * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
+			 * name.
+			 */
+			'ATT_fname'     => [
+				'FHEE__EE_Registrations_List_Table___set_properties__default_sort_by_registration_last_name',
+				true,
+				$this,
+			]
+				? ['ATT_lname' => false]
+				: ['ATT_fname' => false],
+			'event_name'    => ['event_name' => false],
+			'DTT_EVT_start' => ['DTT_EVT_start' => false],
+			'id'            => ['REG_ID' => false],
+		];
+		$this->_hidden_columns   = [];
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param EE_Registration $item the current item
+	 * @return string
+	 */
+	protected function _get_row_class($item): string
+	{
+		$class = parent::_get_row_class($item);
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * Set the $_transaction_details property if not set yet.
+	 *
+	 * @param EE_Registration $registration
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _set_related_details(EE_Registration $registration)
+	{
+		$transaction                = $registration->get_first_related('Transaction');
+		$status                     = $transaction instanceof EE_Transaction
+			? $transaction->status_ID()
+			: EEM_Transaction::failed_status_code;
+		$this->_transaction_details = [
+			'transaction' => $transaction,
+			'status'      => $status,
+			'id'          => $transaction instanceof EE_Transaction
+				? $transaction->ID()
+				: 0,
+			'title_attr'  => sprintf(
+				esc_html__('View Transaction Details (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
+			),
+		];
+		try {
+			$event = $registration->event();
+		} catch (EntityNotFoundException $e) {
+			$event = null;
+		}
+		$status               = $event instanceof EE_Event
+			? $event->get_active_status()
+			: EE_Datetime::inactive;
+		$this->_event_details = [
+			'event'      => $event,
+			'status'     => $status,
+			'id'         => $event instanceof EE_Event
+				? $event->ID()
+				: 0,
+			'title_attr' => sprintf(
+				esc_html__('Edit Event (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
+			),
+		];
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _get_table_filters(): array
+	{
+		$filters = [];
+		// todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as
+		// methods.
+		$cur_date     = $this->_req_data['month_range'] ?? '';
+		$cur_category = $this->_req_data['EVT_CAT'] ?? -1;
+		$reg_status   = $this->_req_data['_reg_status'] ?? '';
+		$filters[]    = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
+		$filters[]    = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
+		$status       = [];
+		$status[]     = ['id' => 0, 'text' => esc_html__('Select Status', 'event_espresso')];
+		foreach ($this->_status as $key => $value) {
+			$status[] = ['id' => $key, 'text' => $value];
+		}
+		if ($this->_view !== 'incomplete') {
+			$filters[] = EEH_Form_Fields::select_input(
+				'_reg_status',
+				$status,
+				isset($this->_req_data['_reg_status'])
+					? strtoupper(sanitize_key($this->_req_data['_reg_status']))
+					: ''
+			);
+		}
+		if (isset($this->_req_data['event_id'])) {
+			$filters[] = EEH_Form_Fields::hidden_input('event_id', $this->_req_data['event_id'], 'reg_event_id');
+		}
+		return $filters;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count']   = $this->_total_registrations();
+		$this->_views['month']['count'] = $this->_total_registrations_this_month();
+		$this->_views['today']['count'] = $this->_total_registrations_today();
+		if ($this->caps_handler->userCanTrashRegistrations()) {
+			$this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
+			$this->_views['trash']['count']      = $this->_total_registrations('trash');
+		}
+	}
+
+
+	/**
+	 * @param string $view
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _total_registrations(string $view = ''): int
+	{
+		$_where = [];
+		$EVT_ID = isset($this->_req_data['event_id'])
+			? absint($this->_req_data['event_id'])
+			: false;
+		if ($EVT_ID) {
+			$_where['EVT_ID'] = $EVT_ID;
+		}
+		switch ($view) {
+			case 'trash':
+				return EEM_Registration::instance()->count_deleted([$_where]);
+			case 'incomplete':
+				$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
+				break;
+			default:
+				$_where['STS_ID'] = ['!=', EEM_Registration::status_id_incomplete];
+		}
+		return EEM_Registration::instance()->count([$_where]);
+	}
+
+
+	/**
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _total_registrations_this_month(): int
+	{
+		$EVT_ID          = isset($this->_req_data['event_id'])
+			? absint($this->_req_data['event_id'])
+			: false;
+		$_where          = $EVT_ID
+			? ['EVT_ID' => $EVT_ID]
+			: [];
+		$this_year_r     = date('Y', current_time('timestamp'));
+		$time_start      = ' 00:00:00';
+		$time_end        = ' 23:59:59';
+		$this_month_r    = date('m', current_time('timestamp'));
+		$days_this_month = date('t', current_time('timestamp'));
+		// setup date query.
+		$beginning_string   = EEM_Registration::instance()->convert_datetime_for_query(
+			'REG_date',
+			$this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
+			'Y-m-d H:i:s'
+		);
+		$end_string         = EEM_Registration::instance()->convert_datetime_for_query(
+			'REG_date',
+			$this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
+			'Y-m-d H:i:s'
+		);
+		$_where['REG_date'] = [
+			'BETWEEN',
+			[
+				$beginning_string,
+				$end_string,
+			],
+		];
+		$_where['STS_ID']   = ['!=', EEM_Registration::status_id_incomplete];
+		return EEM_Registration::instance()->count([$_where]);
+	}
+
+
+	/**
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _total_registrations_today(): int
+	{
+		$EVT_ID             = isset($this->_req_data['event_id'])
+			? absint($this->_req_data['event_id'])
+			: false;
+		$_where             = $EVT_ID
+			? ['EVT_ID' => $EVT_ID]
+			: [];
+		$current_date       = date('Y-m-d', current_time('timestamp'));
+		$time_start         = ' 00:00:00';
+		$time_end           = ' 23:59:59';
+		$_where['REG_date'] = [
+			'BETWEEN',
+			[
+				EEM_Registration::instance()->convert_datetime_for_query(
+					'REG_date',
+					$current_date . $time_start,
+					'Y-m-d H:i:s'
+				),
+				EEM_Registration::instance()->convert_datetime_for_query(
+					'REG_date',
+					$current_date . $time_end,
+					'Y-m-d H:i:s'
+				),
+			],
+		];
+		$_where['STS_ID']   = ['!=', EEM_Registration::status_id_incomplete];
+		return EEM_Registration::instance()->count([$_where]);
+	}
+
+
+	/**
+	 * @param EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_cb($item): string
+	{
+		/** checkbox/lock **/
+		$REG_ID        = $item->ID();
+		$transaction   = $item->get_first_related('Transaction');
+		$payment_count = $transaction instanceof EE_Transaction
+			? $transaction->count_related('Payment')
+			: 0;
+
+		$content = '<input type="checkbox" name="_REG_ID[]" value="' . $REG_ID . '" />';
+		$content .= $payment_count > 0 || ! $this->caps_handler->userCanEditRegistration($item)
+			? '<span class="ee-locked-entity dashicons dashicons-lock ee-aria-tooltip ee-aria-tooltip--big-box" 
                     aria-label="' . $this->lockedRegMessage() . '"></span>'
-            : '';
-        return $this->columnContent('cb', $content, 'center');
-    }
-
-
-    private function lockedRegMessage(): string
-    {
-        return esc_html__(
-            'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_id(EE_Registration $registration): string
-    {
-        $content = '<span class="ee-entity-id">' . $registration->ID() . '</span>';
-        $content .= '<span class="show-on-mobile-view-only">';
-        $content .= $this->column_ATT_fname($registration, false);
-        $content .= '</span>';
-
-        return $this->columnContent('id', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $prep_content
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_ATT_fname(EE_Registration $registration, bool $prep_content = true): string
-    {
-
-        $status         = esc_attr($registration->status_ID());
-        $pretty_status  = EEH_Template::pretty_status($status, false, 'sentence');
-        $prime_reg_star = $registration->count() === 1
-            ? '<sup><span class="dashicons dashicons-star-filled gold-icon"></span></sup>'
-            : '';
-
-        $group_count = '
+			: '';
+		return $this->columnContent('cb', $content, 'center');
+	}
+
+
+	private function lockedRegMessage(): string
+	{
+		return esc_html__(
+			'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_id(EE_Registration $registration): string
+	{
+		$content = '<span class="ee-entity-id">' . $registration->ID() . '</span>';
+		$content .= '<span class="show-on-mobile-view-only">';
+		$content .= $this->column_ATT_fname($registration, false);
+		$content .= '</span>';
+
+		return $this->columnContent('id', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $prep_content
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_ATT_fname(EE_Registration $registration, bool $prep_content = true): string
+	{
+
+		$status         = esc_attr($registration->status_ID());
+		$pretty_status  = EEH_Template::pretty_status($status, false, 'sentence');
+		$prime_reg_star = $registration->count() === 1
+			? '<sup><span class="dashicons dashicons-star-filled gold-icon"></span></sup>'
+			: '';
+
+		$group_count = '
             <span class="reg-count-group-size" >
                 ' . sprintf(
-            esc_html__('(%1$s / %2$s)', 'event_espresso'),
-            $registration->count(),
-            $registration->group_size()
-        ) . '
+			esc_html__('(%1$s / %2$s)', 'event_espresso'),
+			$registration->count(),
+			$registration->group_size()
+		) . '
             </span >';
 
-        $content = '
+		$content = '
         <div class="ee-layout-row">
             <span aria-label="' . $pretty_status . '" 
                   class="ee-status-dot ee-status-bg--' . $status . ' ee-aria-tooltip"
             ></span>
             ' . $this->viewRegistrationLink($registration, $status)
-                   . $prime_reg_star
-                   . $group_count . '
+				   . $prime_reg_star
+				   . $group_count . '
             <span class="spacer"></span>
             <span>
                 ' . sprintf(
-                       esc_html__('Reg Code: %s', 'event_espresso'),
-                       $registration->get('REG_code')
-                   ) . '
+					   esc_html__('Reg Code: %s', 'event_espresso'),
+					   $registration->get('REG_code')
+				   ) . '
             </span>
         </div>';
 
-        $url_params = ['_REG_ID' => $registration->ID()];
-        if (isset($this->_req_data['event_id'])) {
-            $url_params['event_id'] = $registration->event_ID();
-        }
-        // trash/restore/delete actions
-        $actions = $this->trashRegistrationLink($registration, $url_params);
-        $actions = $this->restoreRegistrationLink($registration, $url_params, $actions);
-        $actions = $this->deleteRegistrationLink($registration, $url_params, $actions);
-
-        $content = sprintf('%1$s %2$s', $content, $this->row_actions($actions));
-
-        return $prep_content ? $this->columnContent('ATT_fname', $content) : $content;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $prep_content
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column__REG_date(EE_Registration $registration, bool $prep_content = true): string
-    {
-        $this->_set_related_details($registration);
-        // Build row actions
-        $content = $this->caps_handler->userCanViewTransaction()
-            ? '<a class="ee-aria-tooltip ee-status-color--' . $this->_transaction_details['status'] . '" href="'
-              . $this->viewTransactionUrl()
-              . '" aria-label="'
-              . esc_attr($this->_transaction_details['title_attr'])
-              . '">'
-              . $registration->get_i18n_datetime('REG_date', 'M jS Y g:i a')
-              . '</a>'
-            : $registration->get_i18n_datetime('REG_date');
-
-        return $prep_content ? $this->columnContent('_REG_date', $content) : $content;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_event_name(EE_Registration $registration): string
-    {
-        $this->_set_related_details($registration);
-        $EVT_ID     = $registration->event_ID();
-        $event_name = $registration->event_name();
-        $event_name = $event_name ?: esc_html__("No Associated Event", 'event_espresso');
-        $event_name = wp_trim_words($event_name, 30, '...');
-        $edit_event = $this->editEventLink($EVT_ID, $event_name);
-        $actions['event_filter'] = $this->eventFilterLink($EVT_ID, $event_name);
-        $content = sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions));
-
-        return $this->columnContent('event_name', $content);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_DTT_EVT_start(EE_Registration $registration): string
-    {
-        $datetime_strings = [];
-        $ticket           = $registration->ticket();
-        if ($ticket instanceof EE_Ticket) {
-            $remove_defaults = ['default_where_conditions' => 'none'];
-            $datetimes       = $ticket->datetimes($remove_defaults);
-            foreach ($datetimes as $datetime) {
-                $datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start', 'M jS Y g:i a');
-            }
-            $content = $this->generateDisplayForDatetimes($datetime_strings);
-        } else {
-            $content = esc_html__('There is no ticket on this registration', 'event_espresso');
-        }
-        return $this->columnContent('DTT_EVT_start', $content);
-    }
-
-
-    /**
-     * Receives an array of datetime strings to display and converts them to the html container for the column.
-     *
-     * @param array $datetime_strings
-     * @return string
-     */
-    public function generateDisplayForDatetimes(array $datetime_strings): string
-    {
-        // get first item for initial visibility
-        $content = (string) array_shift($datetime_strings);
-        if (! empty($datetime_strings)) {
-            $content .= '
+		$url_params = ['_REG_ID' => $registration->ID()];
+		if (isset($this->_req_data['event_id'])) {
+			$url_params['event_id'] = $registration->event_ID();
+		}
+		// trash/restore/delete actions
+		$actions = $this->trashRegistrationLink($registration, $url_params);
+		$actions = $this->restoreRegistrationLink($registration, $url_params, $actions);
+		$actions = $this->deleteRegistrationLink($registration, $url_params, $actions);
+
+		$content = sprintf('%1$s %2$s', $content, $this->row_actions($actions));
+
+		return $prep_content ? $this->columnContent('ATT_fname', $content) : $content;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $prep_content
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column__REG_date(EE_Registration $registration, bool $prep_content = true): string
+	{
+		$this->_set_related_details($registration);
+		// Build row actions
+		$content = $this->caps_handler->userCanViewTransaction()
+			? '<a class="ee-aria-tooltip ee-status-color--' . $this->_transaction_details['status'] . '" href="'
+			  . $this->viewTransactionUrl()
+			  . '" aria-label="'
+			  . esc_attr($this->_transaction_details['title_attr'])
+			  . '">'
+			  . $registration->get_i18n_datetime('REG_date', 'M jS Y g:i a')
+			  . '</a>'
+			: $registration->get_i18n_datetime('REG_date');
+
+		return $prep_content ? $this->columnContent('_REG_date', $content) : $content;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_event_name(EE_Registration $registration): string
+	{
+		$this->_set_related_details($registration);
+		$EVT_ID     = $registration->event_ID();
+		$event_name = $registration->event_name();
+		$event_name = $event_name ?: esc_html__("No Associated Event", 'event_espresso');
+		$event_name = wp_trim_words($event_name, 30, '...');
+		$edit_event = $this->editEventLink($EVT_ID, $event_name);
+		$actions['event_filter'] = $this->eventFilterLink($EVT_ID, $event_name);
+		$content = sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions));
+
+		return $this->columnContent('event_name', $content);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_DTT_EVT_start(EE_Registration $registration): string
+	{
+		$datetime_strings = [];
+		$ticket           = $registration->ticket();
+		if ($ticket instanceof EE_Ticket) {
+			$remove_defaults = ['default_where_conditions' => 'none'];
+			$datetimes       = $ticket->datetimes($remove_defaults);
+			foreach ($datetimes as $datetime) {
+				$datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start', 'M jS Y g:i a');
+			}
+			$content = $this->generateDisplayForDatetimes($datetime_strings);
+		} else {
+			$content = esc_html__('There is no ticket on this registration', 'event_espresso');
+		}
+		return $this->columnContent('DTT_EVT_start', $content);
+	}
+
+
+	/**
+	 * Receives an array of datetime strings to display and converts them to the html container for the column.
+	 *
+	 * @param array $datetime_strings
+	 * @return string
+	 */
+	public function generateDisplayForDatetimes(array $datetime_strings): string
+	{
+		// get first item for initial visibility
+		$content = (string) array_shift($datetime_strings);
+		if (! empty($datetime_strings)) {
+			$content .= '
                 <div class="ee-registration-event-datetimes-container-wrap">
                     <button aria-label="' . esc_attr__('Click to view all dates', 'event_espresso') . '" 
                           class="ee-aria-tooltip button button--secondary button--tiny button--icon-only ee-js ee-more-datetimes-toggle"
@@ -613,539 +613,539 @@ 
                         ' . implode("", $datetime_strings) . '
                     </div>
                 </div>';
-        }
-        return $content;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_ATT_email(EE_Registration $registration): string
-    {
-        $attendee = $registration->get_first_related('Attendee');
-        $content  = ! $attendee instanceof EE_Attendee
-            ? esc_html__('No attached contact record.', 'event_espresso')
-            : $attendee->email();
-        return $this->columnContent('ATT_email', $content);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     */
-    public function column__REG_count(EE_Registration $registration): string
-    {
-        $content =
-            sprintf(esc_html__('%1$s / %2$s', 'event_espresso'), $registration->count(), $registration->group_size());
-        return $this->columnContent('_REG_count', $content);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_PRC_amount(EE_Registration $registration): string
-    {
-        $ticket   = $registration->ticket();
-        $req_data = $this->_admin_page->get_request_data();
-
-        $content = isset($req_data['event_id']) && $ticket instanceof EE_Ticket
-            ? '<div class="TKT_name">' . $ticket->name() . '</div>'
-            : '';
-
-        $payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
-        $content        .= $registration->final_price() > 0
-            ? '<span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
+		}
+		return $content;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_ATT_email(EE_Registration $registration): string
+	{
+		$attendee = $registration->get_first_related('Attendee');
+		$content  = ! $attendee instanceof EE_Attendee
+			? esc_html__('No attached contact record.', 'event_espresso')
+			: $attendee->email();
+		return $this->columnContent('ATT_email', $content);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 */
+	public function column__REG_count(EE_Registration $registration): string
+	{
+		$content =
+			sprintf(esc_html__('%1$s / %2$s', 'event_espresso'), $registration->count(), $registration->group_size());
+		return $this->columnContent('_REG_count', $content);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_PRC_amount(EE_Registration $registration): string
+	{
+		$ticket   = $registration->ticket();
+		$req_data = $this->_admin_page->get_request_data();
+
+		$content = isset($req_data['event_id']) && $ticket instanceof EE_Ticket
+			? '<div class="TKT_name">' . $ticket->name() . '</div>'
+			: '';
+
+		$payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
+		$content        .= $registration->final_price() > 0
+			? '<span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
                 ' . $registration->pretty_final_price() . '
                </span>'
-            // free event
-            : '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
-
-        return $this->columnContent('PRC_amount', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column__REG_final_price(EE_Registration $registration): string
-    {
-        $ticket   = $registration->ticket();
-        $req_data = $this->_admin_page->get_request_data();
-        $content  = isset($req_data['event_id']) || ! $ticket instanceof EE_Ticket
-            ? ''
-            : '<span class="TKT_name ee-status-color--'
-              . $ticket->ticket_status()
-              . '">'
-              . $ticket->name()
-              . '</span> ';
-
-        $content .= '
+			// free event
+			: '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+
+		return $this->columnContent('PRC_amount', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column__REG_final_price(EE_Registration $registration): string
+	{
+		$ticket   = $registration->ticket();
+		$req_data = $this->_admin_page->get_request_data();
+		$content  = isset($req_data['event_id']) || ! $ticket instanceof EE_Ticket
+			? ''
+			: '<span class="TKT_name ee-status-color--'
+			  . $ticket->ticket_status()
+			  . '">'
+			  . $ticket->name()
+			  . '</span> ';
+
+		$content .= '
             <span class="reg-overview-paid-event-spn">
                 ' . $registration->pretty_final_price() . '
             </span>';
-        return $this->columnContent('_REG_final_price', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     */
-    public function column__REG_paid(EE_Registration $registration): string
-    {
-        $payment_method      = $registration->payment_method();
-        $payment_method_name = $payment_method instanceof EE_Payment_Method
-            ? $payment_method->admin_name()
-            : esc_html__('Unknown', 'event_espresso');
-
-        $payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
-        $content        = '
+		return $this->columnContent('_REG_final_price', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column__REG_paid(EE_Registration $registration): string
+	{
+		$payment_method      = $registration->payment_method();
+		$payment_method_name = $payment_method instanceof EE_Payment_Method
+			? $payment_method->admin_name()
+			: esc_html__('Unknown', 'event_espresso');
+
+		$payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
+		$content        = '
             <span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
                 ' . $registration->pretty_paid() . '
             </span>';
-        if ($registration->paid() > 0) {
-            $content .= '<span class="ee-status-text-small">'
-                        . sprintf(
-                            esc_html__('...via %s', 'event_espresso'),
-                            $payment_method_name
-                        )
-                        . '</span>';
-        }
-        return $this->columnContent('_REG_paid', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_TXN_total(EE_Registration $registration): string
-    {
-        if ($registration->transaction()) {
-            $content = $this->caps_handler->userCanViewTransaction()
-                ? '
+		if ($registration->paid() > 0) {
+			$content .= '<span class="ee-status-text-small">'
+						. sprintf(
+							esc_html__('...via %s', 'event_espresso'),
+							$payment_method_name
+						)
+						. '</span>';
+		}
+		return $this->columnContent('_REG_paid', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_TXN_total(EE_Registration $registration): string
+	{
+		if ($registration->transaction()) {
+			$content = $this->caps_handler->userCanViewTransaction()
+				? '
                     <a class="ee-aria-tooltip ee-status-color--' . $registration->transaction()->status_ID() . '" 
                         href="' . $this->viewTransactionUrl() . '" 
                         aria-label="' . esc_attr__('View Transaction', 'event_espresso') . '"
                     >
                         ' . $registration->transaction()->pretty_total() . '
                     </a>'
-                : $registration->transaction()->pretty_total();
-        } else {
-            $content = esc_html__("None", "event_espresso");
-        }
-        return $this->columnContent('TXN_total', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_TXN_paid(EE_Registration $registration): string
-    {
-        $content = '&nbsp;';
-        $align   = 'end';
-        if ($registration->count() === 1) {
-            $transaction = $registration->transaction()
-                ? $registration->transaction()
-                : EE_Transaction::new_instance();
-            if ($transaction->paid() >= $transaction->total()) {
-                $align   = 'center';
-                $content = '<span class="dashicons dashicons-yes green-icon"></span>';
-            } else {
-                $content = $this->caps_handler->userCanViewTransaction()
-                    ? '
+				: $registration->transaction()->pretty_total();
+		} else {
+			$content = esc_html__("None", "event_espresso");
+		}
+		return $this->columnContent('TXN_total', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_TXN_paid(EE_Registration $registration): string
+	{
+		$content = '&nbsp;';
+		$align   = 'end';
+		if ($registration->count() === 1) {
+			$transaction = $registration->transaction()
+				? $registration->transaction()
+				: EE_Transaction::new_instance();
+			if ($transaction->paid() >= $transaction->total()) {
+				$align   = 'center';
+				$content = '<span class="dashicons dashicons-yes green-icon"></span>';
+			} else {
+				$content = $this->caps_handler->userCanViewTransaction()
+					? '
                     <a class="ee-aria-tooltip ee-status-color--' . $transaction->status_ID() . '" 
                         href="' . $this->viewTransactionUrl() . '"  
                         aria-label="' . esc_attr__('View Transaction', 'event_espresso') . '"
                     >
                         ' . $registration->transaction()->pretty_paid() . '
                     </a>'
-                    : $registration->transaction()->pretty_paid();
-            }
-        }
-        return $this->columnContent('TXN_paid', $content, $align);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_actions(EE_Registration $registration): string
-    {
-        $attendee = $registration->attendee();
-        $this->_set_related_details($registration);
-
-        // Build and filter row actions
-        $actions = apply_filters(
-            'FHEE__EE_Registrations_List_Table__column_actions__actions',
-            [
-                'view_lnk'               => $this->viewRegistrationAction($registration),
-                'edit_lnk'               => $this->editContactAction($registration, $attendee),
-                'resend_reg_lnk'         => $this->resendRegistrationMessageAction($registration, $attendee),
-                'view_txn_lnk'           => $this->viewTransactionAction(),
-                'dl_invoice_lnk'         => $this->viewTransactionInvoiceAction($registration, $attendee),
-                'filtered_messages_link' => $this->viewNotificationsAction($registration),
-            ],
-            $registration,
-            $this
-        );
-
-        $content = $this->_action_string(
-            implode('', $actions),
-            $registration,
-            'div',
-            'reg-overview-actions ee-list-table-actions'
-        );
-
-        return $this->columnContent('actions', $this->actionsModalMenu($content));
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function viewRegistrationUrl(EE_Registration $registration): string
-    {
-        return EE_Admin_Page::add_query_args_and_nonce(
-            [
-                'action'  => 'view_registration',
-                '_REG_ID' => $registration->ID(),
-            ],
-            REG_ADMIN_URL
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function viewRegistrationLink(
-        EE_Registration $registration,
-        string $status
-    ): string {
-        $attendee      = $registration->attendee();
-        $attendee_name = $attendee instanceof EE_Attendee
-            ? $attendee->full_name()
-            : '';
-        return $this->caps_handler->userCanReadRegistration($registration)
-            ? '
+					: $registration->transaction()->pretty_paid();
+			}
+		}
+		return $this->columnContent('TXN_paid', $content, $align);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_actions(EE_Registration $registration): string
+	{
+		$attendee = $registration->attendee();
+		$this->_set_related_details($registration);
+
+		// Build and filter row actions
+		$actions = apply_filters(
+			'FHEE__EE_Registrations_List_Table__column_actions__actions',
+			[
+				'view_lnk'               => $this->viewRegistrationAction($registration),
+				'edit_lnk'               => $this->editContactAction($registration, $attendee),
+				'resend_reg_lnk'         => $this->resendRegistrationMessageAction($registration, $attendee),
+				'view_txn_lnk'           => $this->viewTransactionAction(),
+				'dl_invoice_lnk'         => $this->viewTransactionInvoiceAction($registration, $attendee),
+				'filtered_messages_link' => $this->viewNotificationsAction($registration),
+			],
+			$registration,
+			$this
+		);
+
+		$content = $this->_action_string(
+			implode('', $actions),
+			$registration,
+			'div',
+			'reg-overview-actions ee-list-table-actions'
+		);
+
+		return $this->columnContent('actions', $this->actionsModalMenu($content));
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function viewRegistrationUrl(EE_Registration $registration): string
+	{
+		return EE_Admin_Page::add_query_args_and_nonce(
+			[
+				'action'  => 'view_registration',
+				'_REG_ID' => $registration->ID(),
+			],
+			REG_ADMIN_URL
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function viewRegistrationLink(
+		EE_Registration $registration,
+		string $status
+	): string {
+		$attendee      = $registration->attendee();
+		$attendee_name = $attendee instanceof EE_Attendee
+			? $attendee->full_name()
+			: '';
+		return $this->caps_handler->userCanReadRegistration($registration)
+			? '
             <a  href="' . $this->viewRegistrationUrl($registration) . '"  
                 class="row-title ee-status-color--' . $status . ' ee-aria-tooltip" 
                 aria-label="' . esc_attr__('View Registration Details', 'event_espresso') . '"
             >
                 ' . $attendee_name . '
             </a>'
-            : $attendee_name;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function viewRegistrationAction(EE_Registration $registration): string
-    {
-        return $this->caps_handler->userCanReadRegistration($registration)
-            ? '
+			: $attendee_name;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function viewRegistrationAction(EE_Registration $registration): string
+	{
+		return $this->caps_handler->userCanReadRegistration($registration)
+			? '
             <a  href="' . $this->viewRegistrationUrl($registration) . '"  
                 class="ee-aria-tooltip button button--icon-only"
                 aria-label="' . esc_attr__('View Registration Details', 'event_espresso') . '"
             >
                 <span class="dashicons dashicons-clipboard"></span>
             </a>'
-            : '';
-    }
-
-
-    private function editContactAction(EE_Registration $registration, ?EE_Attendee $attendee = null): string
-    {
-
-        if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanEditContacts()) {
-            $edit_link_url = EE_Admin_Page::add_query_args_and_nonce(
-                [
-                    'action' => 'edit_attendee',
-                    'post'   => $registration->attendee_ID(),
-                ],
-                REG_ADMIN_URL
-            );
-            return '
+			: '';
+	}
+
+
+	private function editContactAction(EE_Registration $registration, ?EE_Attendee $attendee = null): string
+	{
+
+		if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanEditContacts()) {
+			$edit_link_url = EE_Admin_Page::add_query_args_and_nonce(
+				[
+					'action' => 'edit_attendee',
+					'post'   => $registration->attendee_ID(),
+				],
+				REG_ADMIN_URL
+			);
+			return '
                 <a href="' . $edit_link_url . '" 
                    aria-label="' . esc_attr__('Edit Contact Details', 'event_espresso') . '" 
                    class="ee-aria-tooltip button button--secondary button--icon-only"
                 >
                     <span class="dashicons dashicons-admin-users"></span>
                 </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function resendRegistrationMessageAction(
-        EE_Registration $registration,
-        ?EE_Attendee $attendee = null
-    ): string {
-        if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanResendMessage($registration)) {
-            $resend_reg_link_url = EE_Admin_Page::add_query_args_and_nonce(
-                [
-                    'action'  => 'resend_registration',
-                    '_REG_ID' => $registration->ID(),
-                ],
-                REG_ADMIN_URL,
-                true
-            );
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function resendRegistrationMessageAction(
+		EE_Registration $registration,
+		?EE_Attendee $attendee = null
+	): string {
+		if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanResendMessage($registration)) {
+			$resend_reg_link_url = EE_Admin_Page::add_query_args_and_nonce(
+				[
+					'action'  => 'resend_registration',
+					'_REG_ID' => $registration->ID(),
+				],
+				REG_ADMIN_URL,
+				true
+			);
+			return '
 			    <a href="' . $resend_reg_link_url . '" aria-label="'
-                                         . esc_attr__('Resend Registration Details', 'event_espresso')
-                                         . '" class="ee-aria-tooltip button button--icon-only">
+										 . esc_attr__('Resend Registration Details', 'event_espresso')
+										 . '" class="ee-aria-tooltip button button--icon-only">
 			        <span class="dashicons dashicons-email-alt"></span>
 			    </a>';
-        }
-        return '';
-    }
-
-
-    private function viewTransactionUrl(): string
-    {
-        return EE_Admin_Page::add_query_args_and_nonce(
-            [
-                    'action' => 'view_transaction',
-                    'TXN_ID' => $this->_transaction_details['id'],
-                ],
-            TXN_ADMIN_URL
-        );
-    }
-
-
-    private function viewTransactionAction(): string
-    {
-        if ($this->caps_handler->userCanViewTransaction()) {
-            return '
+		}
+		return '';
+	}
+
+
+	private function viewTransactionUrl(): string
+	{
+		return EE_Admin_Page::add_query_args_and_nonce(
+			[
+					'action' => 'view_transaction',
+					'TXN_ID' => $this->_transaction_details['id'],
+				],
+			TXN_ADMIN_URL
+		);
+	}
+
+
+	private function viewTransactionAction(): string
+	{
+		if ($this->caps_handler->userCanViewTransaction()) {
+			return '
                 <a class="ee-aria-tooltip button button--icon-only" 
                    href="' . $this->viewTransactionUrl() . '"  
                    aria-label="' . $this->_transaction_details['title_attr'] . '"
                 >
                     <span class="dashicons dashicons-cart"></span>
                 </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function viewTransactionInvoiceAction(
-        EE_Registration $registration,
-        ?EE_Attendee $attendee = null
-    ): string {
-        // only show invoice link if message type is active.
-        if (
-            $attendee instanceof EE_Attendee
-            && $registration->is_primary_registrant()
-            && EEH_MSG_Template::is_mt_active('invoice')
-        ) {
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function viewTransactionInvoiceAction(
+		EE_Registration $registration,
+		?EE_Attendee $attendee = null
+	): string {
+		// only show invoice link if message type is active.
+		if (
+			$attendee instanceof EE_Attendee
+			&& $registration->is_primary_registrant()
+			&& EEH_MSG_Template::is_mt_active('invoice')
+		) {
+			return '
                 <a aria-label="' . esc_attr__('View Transaction Invoice', 'event_espresso')
-                                         . '" target="_blank" href="' . $registration->invoice_url() . '" class="ee-aria-tooltip button button--icon-only">
+										 . '" target="_blank" href="' . $registration->invoice_url() . '" class="ee-aria-tooltip button button--icon-only">
                     <span class="dashicons dashicons-media-spreadsheet"></span>
                 </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    private function viewNotificationsAction(EE_Registration $registration): string
-    {
-        // message list table link (filtered by REG_ID
-        return $this->caps_handler->userCanReadGlobalMessages()
-            ? EEH_MSG_Template::get_message_action_link(
-                'see_notifications_for',
-                null,
-                ['_REG_ID' => $registration->ID()]
-            )
-            : '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function trashRegistrationLink(
-        EE_Registration $registration,
-        array $url_params
-    ): array {
-        $actions = [];
-        // can't trash what's already trashed
-        if ($this->_view === 'trash') {
-            return $actions;
-        }
-
-        // check caps
-        if (! $this->caps_handler->userCanTrashRegistration($registration)) {
-            return $actions;
-        }
-
-        // don't delete registrations that have payments applied
-        $transaction   = $registration->get_first_related('Transaction');
-        $payment_count = $transaction instanceof EE_Transaction
-            ? $transaction->count_related('Payment')
-            : 0;
-
-        if ($payment_count > 0) {
-            return $actions;
-        }
-
-        $url_params['action'] = 'trash_registrations';
-        $trash_link_url       = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
-        $actions['trash']     = '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	private function viewNotificationsAction(EE_Registration $registration): string
+	{
+		// message list table link (filtered by REG_ID
+		return $this->caps_handler->userCanReadGlobalMessages()
+			? EEH_MSG_Template::get_message_action_link(
+				'see_notifications_for',
+				null,
+				['_REG_ID' => $registration->ID()]
+			)
+			: '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function trashRegistrationLink(
+		EE_Registration $registration,
+		array $url_params
+	): array {
+		$actions = [];
+		// can't trash what's already trashed
+		if ($this->_view === 'trash') {
+			return $actions;
+		}
+
+		// check caps
+		if (! $this->caps_handler->userCanTrashRegistration($registration)) {
+			return $actions;
+		}
+
+		// don't delete registrations that have payments applied
+		$transaction   = $registration->get_first_related('Transaction');
+		$payment_count = $transaction instanceof EE_Transaction
+			? $transaction->count_related('Payment')
+			: 0;
+
+		if ($payment_count > 0) {
+			return $actions;
+		}
+
+		$url_params['action'] = 'trash_registrations';
+		$trash_link_url       = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
+		$actions['trash']     = '
             <a class="ee-aria-tooltip" 
                 href="' . $trash_link_url . '" 
                 aria-label="' . esc_attr__('Trash Registration', 'event_espresso') . '"
             >
                 ' . esc_html__('Trash', 'event_espresso') . '
             </a>';
-        return $actions;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function restoreRegistrationLink(
-        EE_Registration $registration,
-        array $url_params,
-        array $actions
-    ): array {
-        // can't restore what's not trashed
-        if ($this->_view !== 'trash') {
-            return $actions;
-        }
-
-        // restore registration link
-        if ($this->caps_handler->userCanRestoreRegistration($registration)) {
-            $url_params['action'] = 'restore_registrations';
-            $restore_link_url     = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
-            $actions['restore']   = '
+		return $actions;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function restoreRegistrationLink(
+		EE_Registration $registration,
+		array $url_params,
+		array $actions
+	): array {
+		// can't restore what's not trashed
+		if ($this->_view !== 'trash') {
+			return $actions;
+		}
+
+		// restore registration link
+		if ($this->caps_handler->userCanRestoreRegistration($registration)) {
+			$url_params['action'] = 'restore_registrations';
+			$restore_link_url     = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
+			$actions['restore']   = '
                 <a class="ee-aria-tooltip" 
                     href="' . $restore_link_url . '" 
                     aria-label="' . esc_attr__('Restore Registration', 'event_espresso') . '"
                 >
                     ' . esc_html__('Restore', 'event_espresso') . '
                 </a>';
-        }
-
-        return $actions;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function deleteRegistrationLink(
-        EE_Registration $registration,
-        array $url_params,
-        array $actions
-    ): array {
-        if ($this->_view === 'trash' && $this->caps_handler->userCanDeleteRegistration($registration)) {
-            $url_params['action'] = 'delete_registrations';
-            $delete_link_url      = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
-            $actions['delete']    = '
+		}
+
+		return $actions;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function deleteRegistrationLink(
+		EE_Registration $registration,
+		array $url_params,
+		array $actions
+	): array {
+		if ($this->_view === 'trash' && $this->caps_handler->userCanDeleteRegistration($registration)) {
+			$url_params['action'] = 'delete_registrations';
+			$delete_link_url      = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
+			$actions['delete']    = '
                 <a class="ee-aria-tooltip" 
                     href="' . $delete_link_url . '" 
                     aria-label="' . esc_attr__('Delete Registration Permanently', 'event_espresso') . '"
                 >
                     ' . esc_html__('Delete', 'event_espresso') . '
                 </a>';
-        }
-        return $actions;
-    }
-
-
-    private function editEventLink(int $EVT_ID, string $event_name): string
-    {
-        if (! $EVT_ID || ! $this->caps_handler->userCanEditEvent($EVT_ID)) {
-            return $event_name;
-        }
-        $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'edit', 'post' => $EVT_ID],
-            EVENTS_ADMIN_URL
-        );
-        return '
+		}
+		return $actions;
+	}
+
+
+	private function editEventLink(int $EVT_ID, string $event_name): string
+	{
+		if (! $EVT_ID || ! $this->caps_handler->userCanEditEvent($EVT_ID)) {
+			return $event_name;
+		}
+		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'edit', 'post' => $EVT_ID],
+			EVENTS_ADMIN_URL
+		);
+		return '
             <a class="ee-aria-tooltip ee-status-color--' . $this->_event_details['status'] . '" 
                 href="' . $edit_event_url . '" 
                 aria-label="' . esc_attr($this->_event_details['title_attr']) . '"
             >
                 ' . $event_name . '
             </a>';
-    }
+	}
 
 
-    private function eventFilterLink(int $EVT_ID, string $event_name): string
-    {
-        if (!$EVT_ID) {
-            return '';
-        }
-        $event_filter_url = EE_Admin_Page::add_query_args_and_nonce(['event_id' => $EVT_ID], REG_ADMIN_URL);
-        return '
+	private function eventFilterLink(int $EVT_ID, string $event_name): string
+	{
+		if (!$EVT_ID) {
+			return '';
+		}
+		$event_filter_url = EE_Admin_Page::add_query_args_and_nonce(['event_id' => $EVT_ID], REG_ADMIN_URL);
+		return '
             <a  class="ee-aria-tooltip ee-event-filter-link" 
                 href="' . $event_filter_url . '" 
                 aria-label="' . sprintf(
-                    esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
-                    $event_name
-                ) . '"
+					esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
+					$event_name
+				) . '"
             >
                 <span class="dashicons dashicons-groups dashicons--small"></span>'
-                . esc_html__('View Registrations', 'event_espresso') . '
+				. esc_html__('View Registrations', 'event_espresso') . '
             </a>';
-    }
+	}
 }

Spacing +76 added lines, -76 removed lines

@@ -53,10 +53,10 @@ 
     {
         $this->caps_handler = new RegistrationsListTableUserCapabilities(EE_Registry::instance()->CAP);
         $req_data = $admin_page->get_request_data();
-        if (! empty($req_data['event_id'])) {
+        if ( ! empty($req_data['event_id'])) {
             $extra_query_args = [];
             foreach ($admin_page->get_views() as $view_details) {
-                $extra_query_args[ $view_details['slug'] ] = ['event_id' => $req_data['event_id']];
+                $extra_query_args[$view_details['slug']] = ['event_id' => $req_data['event_id']];
             }
             $this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
         }
@@ -88,9 +88,9 @@ 
             'ajax'     => true,
             'screen'   => $this->_admin_page->get_current_screen()->id,
         ];
-        $req_data            = $this->_admin_page->get_request_data();
+        $req_data = $this->_admin_page->get_request_data();
         if (isset($req_data['event_id'])) {
-            $this->_columns        = [
+            $this->_columns = [
                 'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
                 'id'               => esc_html__('ID', 'event_espresso'),
                 'ATT_fname'        => esc_html__('Name', 'event_espresso'),
@@ -112,7 +112,7 @@ 
                 ],
             ];
         } else {
-            $this->_columns        = [
+            $this->_columns = [
                 'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
                 'id'               => esc_html__('ID', 'event_espresso'),
                 'ATT_fname'        => esc_html__('Name', 'event_espresso'),
@@ -139,7 +139,7 @@ 
                 'return_url'  => $return_url,
             ],
         ];
-        $filters                                  = array_diff_key(
+        $filters = array_diff_key(
             $this->_req_data,
             array_flip(
                 [
@@ -149,12 +149,12 @@ 
                 ]
             )
         );
-        if (! empty($filters)) {
+        if ( ! empty($filters)) {
             $this->_bottom_buttons['report_filtered']['extra_request']['filters'] = $filters;
         }
         $this->_primary_column   = 'id';
         $this->_sortable_columns = [
-            '_REG_date'     => ['_REG_date' => true],   // true means its already sorted
+            '_REG_date'     => ['_REG_date' => true], // true means its already sorted
             /**
              * Allows users to change the default sort if they wish.
              * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
@@ -171,7 +171,7 @@ 
             'DTT_EVT_start' => ['DTT_EVT_start' => false],
             'id'            => ['REG_ID' => false],
         ];
-        $this->_hidden_columns   = [];
+        $this->_hidden_columns = [];
     }
 
 
@@ -344,14 +344,14 @@ 
         $this_month_r    = date('m', current_time('timestamp'));
         $days_this_month = date('t', current_time('timestamp'));
         // setup date query.
-        $beginning_string   = EEM_Registration::instance()->convert_datetime_for_query(
+        $beginning_string = EEM_Registration::instance()->convert_datetime_for_query(
             'REG_date',
-            $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
+            $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start,
             'Y-m-d H:i:s'
         );
-        $end_string         = EEM_Registration::instance()->convert_datetime_for_query(
+        $end_string = EEM_Registration::instance()->convert_datetime_for_query(
             'REG_date',
-            $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
+            $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end,
             'Y-m-d H:i:s'
         );
         $_where['REG_date'] = [
@@ -361,7 +361,7 @@ 
                 $end_string,
             ],
         ];
-        $_where['STS_ID']   = ['!=', EEM_Registration::status_id_incomplete];
+        $_where['STS_ID'] = ['!=', EEM_Registration::status_id_incomplete];
         return EEM_Registration::instance()->count([$_where]);
     }
 
@@ -387,17 +387,17 @@ 
             [
                 EEM_Registration::instance()->convert_datetime_for_query(
                     'REG_date',
-                    $current_date . $time_start,
+                    $current_date.$time_start,
                     'Y-m-d H:i:s'
                 ),
                 EEM_Registration::instance()->convert_datetime_for_query(
                     'REG_date',
-                    $current_date . $time_end,
+                    $current_date.$time_end,
                     'Y-m-d H:i:s'
                 ),
             ],
         ];
-        $_where['STS_ID']   = ['!=', EEM_Registration::status_id_incomplete];
+        $_where['STS_ID'] = ['!=', EEM_Registration::status_id_incomplete];
         return EEM_Registration::instance()->count([$_where]);
     }
 
@@ -420,10 +420,10 @@ 
             ? $transaction->count_related('Payment')
             : 0;
 
-        $content = '<input type="checkbox" name="_REG_ID[]" value="' . $REG_ID . '" />';
+        $content = '<input type="checkbox" name="_REG_ID[]" value="'.$REG_ID.'" />';
         $content .= $payment_count > 0 || ! $this->caps_handler->userCanEditRegistration($item)
             ? '<span class="ee-locked-entity dashicons dashicons-lock ee-aria-tooltip ee-aria-tooltip--big-box" 
-                    aria-label="' . $this->lockedRegMessage() . '"></span>'
+                    aria-label="' . $this->lockedRegMessage().'"></span>'
             : '';
         return $this->columnContent('cb', $content, 'center');
     }
@@ -449,7 +449,7 @@ 
      */
     public function column_id(EE_Registration $registration): string
     {
-        $content = '<span class="ee-entity-id">' . $registration->ID() . '</span>';
+        $content = '<span class="ee-entity-id">'.$registration->ID().'</span>';
         $content .= '<span class="show-on-mobile-view-only">';
         $content .= $this->column_ATT_fname($registration, false);
         $content .= '</span>';
@@ -480,23 +480,23 @@ 
             esc_html__('(%1$s / %2$s)', 'event_espresso'),
             $registration->count(),
             $registration->group_size()
-        ) . '
+        ).'
             </span >';
 
         $content = '
         <div class="ee-layout-row">
-            <span aria-label="' . $pretty_status . '" 
-                  class="ee-status-dot ee-status-bg--' . $status . ' ee-aria-tooltip"
+            <span aria-label="' . $pretty_status.'" 
+                  class="ee-status-dot ee-status-bg--' . $status.' ee-aria-tooltip"
             ></span>
             ' . $this->viewRegistrationLink($registration, $status)
                    . $prime_reg_star
-                   . $group_count . '
+                   . $group_count.'
             <span class="spacer"></span>
             <span>
                 ' . sprintf(
                        esc_html__('Reg Code: %s', 'event_espresso'),
                        $registration->get('REG_code')
-                   ) . '
+                   ).'
             </span>
         </div>';
 
@@ -527,7 +527,7 @@ 
         $this->_set_related_details($registration);
         // Build row actions
         $content = $this->caps_handler->userCanViewTransaction()
-            ? '<a class="ee-aria-tooltip ee-status-color--' . $this->_transaction_details['status'] . '" href="'
+            ? '<a class="ee-aria-tooltip ee-status-color--'.$this->_transaction_details['status'].'" href="'
               . $this->viewTransactionUrl()
               . '" aria-label="'
               . esc_attr($this->_transaction_details['title_attr'])
@@ -601,16 +601,16 @@ 
     {
         // get first item for initial visibility
         $content = (string) array_shift($datetime_strings);
-        if (! empty($datetime_strings)) {
+        if ( ! empty($datetime_strings)) {
             $content .= '
                 <div class="ee-registration-event-datetimes-container-wrap">
-                    <button aria-label="' . esc_attr__('Click to view all dates', 'event_espresso') . '" 
+                    <button aria-label="' . esc_attr__('Click to view all dates', 'event_espresso').'" 
                           class="ee-aria-tooltip button button--secondary button--tiny button--icon-only ee-js ee-more-datetimes-toggle"
                     >
                         <span class="dashicons dashicons-admin-collapse"></span>
                     </button>
                     <div class="ee-registration-event-datetimes-container more-items hidden">
-                        ' . implode("", $datetime_strings) . '
+                        ' . implode("", $datetime_strings).'
                     </div>
                 </div>';
         }
@@ -661,16 +661,16 @@ 
         $req_data = $this->_admin_page->get_request_data();
 
         $content = isset($req_data['event_id']) && $ticket instanceof EE_Ticket
-            ? '<div class="TKT_name">' . $ticket->name() . '</div>'
+            ? '<div class="TKT_name">'.$ticket->name().'</div>'
             : '';
 
         $payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
-        $content        .= $registration->final_price() > 0
-            ? '<span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
-                ' . $registration->pretty_final_price() . '
+        $content .= $registration->final_price() > 0
+            ? '<span class="reg-overview-paid-event-spn ee-status-color--'.$payment_status.'">
+                ' . $registration->pretty_final_price().'
                </span>'
             // free event
-            : '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+            : '<span class="reg-overview-free-event-spn">'.esc_html__('free', 'event_espresso').'</span>';
 
         return $this->columnContent('PRC_amount', $content, 'end');
     }
@@ -696,7 +696,7 @@ 
 
         $content .= '
             <span class="reg-overview-paid-event-spn">
-                ' . $registration->pretty_final_price() . '
+                ' . $registration->pretty_final_price().'
             </span>';
         return $this->columnContent('_REG_final_price', $content, 'end');
     }
@@ -716,8 +716,8 @@ 
 
         $payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
         $content        = '
-            <span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
-                ' . $registration->pretty_paid() . '
+            <span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status.'">
+                ' . $registration->pretty_paid().'
             </span>';
         if ($registration->paid() > 0) {
             $content .= '<span class="ee-status-text-small">'
@@ -746,11 +746,11 @@ 
         if ($registration->transaction()) {
             $content = $this->caps_handler->userCanViewTransaction()
                 ? '
-                    <a class="ee-aria-tooltip ee-status-color--' . $registration->transaction()->status_ID() . '" 
-                        href="' . $this->viewTransactionUrl() . '" 
-                        aria-label="' . esc_attr__('View Transaction', 'event_espresso') . '"
+                    <a class="ee-aria-tooltip ee-status-color--' . $registration->transaction()->status_ID().'" 
+                        href="' . $this->viewTransactionUrl().'" 
+                        aria-label="' . esc_attr__('View Transaction', 'event_espresso').'"
                     >
-                        ' . $registration->transaction()->pretty_total() . '
+                        ' . $registration->transaction()->pretty_total().'
                     </a>'
                 : $registration->transaction()->pretty_total();
         } else {
@@ -784,11 +784,11 @@ 
             } else {
                 $content = $this->caps_handler->userCanViewTransaction()
                     ? '
-                    <a class="ee-aria-tooltip ee-status-color--' . $transaction->status_ID() . '" 
-                        href="' . $this->viewTransactionUrl() . '"  
-                        aria-label="' . esc_attr__('View Transaction', 'event_espresso') . '"
+                    <a class="ee-aria-tooltip ee-status-color--' . $transaction->status_ID().'" 
+                        href="' . $this->viewTransactionUrl().'"  
+                        aria-label="' . esc_attr__('View Transaction', 'event_espresso').'"
                     >
-                        ' . $registration->transaction()->pretty_paid() . '
+                        ' . $registration->transaction()->pretty_paid().'
                     </a>'
                     : $registration->transaction()->pretty_paid();
             }
@@ -867,11 +867,11 @@ 
             : '';
         return $this->caps_handler->userCanReadRegistration($registration)
             ? '
-            <a  href="' . $this->viewRegistrationUrl($registration) . '"  
-                class="row-title ee-status-color--' . $status . ' ee-aria-tooltip" 
-                aria-label="' . esc_attr__('View Registration Details', 'event_espresso') . '"
+            <a  href="' . $this->viewRegistrationUrl($registration).'"  
+                class="row-title ee-status-color--' . $status.' ee-aria-tooltip" 
+                aria-label="' . esc_attr__('View Registration Details', 'event_espresso').'"
             >
-                ' . $attendee_name . '
+                ' . $attendee_name.'
             </a>'
             : $attendee_name;
     }
@@ -885,9 +885,9 @@ 
     {
         return $this->caps_handler->userCanReadRegistration($registration)
             ? '
-            <a  href="' . $this->viewRegistrationUrl($registration) . '"  
+            <a  href="' . $this->viewRegistrationUrl($registration).'"  
                 class="ee-aria-tooltip button button--icon-only"
-                aria-label="' . esc_attr__('View Registration Details', 'event_espresso') . '"
+                aria-label="' . esc_attr__('View Registration Details', 'event_espresso').'"
             >
                 <span class="dashicons dashicons-clipboard"></span>
             </a>'
@@ -907,8 +907,8 @@ 
                 REG_ADMIN_URL
             );
             return '
-                <a href="' . $edit_link_url . '" 
-                   aria-label="' . esc_attr__('Edit Contact Details', 'event_espresso') . '" 
+                <a href="' . $edit_link_url.'" 
+                   aria-label="' . esc_attr__('Edit Contact Details', 'event_espresso').'" 
                    class="ee-aria-tooltip button button--secondary button--icon-only"
                 >
                     <span class="dashicons dashicons-admin-users"></span>
@@ -936,7 +936,7 @@ 
                 true
             );
             return '
-			    <a href="' . $resend_reg_link_url . '" aria-label="'
+			    <a href="' . $resend_reg_link_url.'" aria-label="'
                                          . esc_attr__('Resend Registration Details', 'event_espresso')
                                          . '" class="ee-aria-tooltip button button--icon-only">
 			        <span class="dashicons dashicons-email-alt"></span>
@@ -963,8 +963,8 @@ 
         if ($this->caps_handler->userCanViewTransaction()) {
             return '
                 <a class="ee-aria-tooltip button button--icon-only" 
-                   href="' . $this->viewTransactionUrl() . '"  
-                   aria-label="' . $this->_transaction_details['title_attr'] . '"
+                   href="' . $this->viewTransactionUrl().'"  
+                   aria-label="' . $this->_transaction_details['title_attr'].'"
                 >
                     <span class="dashicons dashicons-cart"></span>
                 </a>';
@@ -989,7 +989,7 @@ 
         ) {
             return '
                 <a aria-label="' . esc_attr__('View Transaction Invoice', 'event_espresso')
-                                         . '" target="_blank" href="' . $registration->invoice_url() . '" class="ee-aria-tooltip button button--icon-only">
+                                         . '" target="_blank" href="'.$registration->invoice_url().'" class="ee-aria-tooltip button button--icon-only">
                     <span class="dashicons dashicons-media-spreadsheet"></span>
                 </a>';
         }
@@ -1029,7 +1029,7 @@ 
         }
 
         // check caps
-        if (! $this->caps_handler->userCanTrashRegistration($registration)) {
+        if ( ! $this->caps_handler->userCanTrashRegistration($registration)) {
             return $actions;
         }
 
@@ -1047,10 +1047,10 @@ 
         $trash_link_url       = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
         $actions['trash']     = '
             <a class="ee-aria-tooltip" 
-                href="' . $trash_link_url . '" 
-                aria-label="' . esc_attr__('Trash Registration', 'event_espresso') . '"
+                href="' . $trash_link_url.'" 
+                aria-label="' . esc_attr__('Trash Registration', 'event_espresso').'"
             >
-                ' . esc_html__('Trash', 'event_espresso') . '
+                ' . esc_html__('Trash', 'event_espresso').'
             </a>';
         return $actions;
     }
@@ -1076,10 +1076,10 @@ 
             $restore_link_url     = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
             $actions['restore']   = '
                 <a class="ee-aria-tooltip" 
-                    href="' . $restore_link_url . '" 
-                    aria-label="' . esc_attr__('Restore Registration', 'event_espresso') . '"
+                    href="' . $restore_link_url.'" 
+                    aria-label="' . esc_attr__('Restore Registration', 'event_espresso').'"
                 >
-                    ' . esc_html__('Restore', 'event_espresso') . '
+                    ' . esc_html__('Restore', 'event_espresso').'
                 </a>';
         }
 
@@ -1101,10 +1101,10 @@ 
             $delete_link_url      = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
             $actions['delete']    = '
                 <a class="ee-aria-tooltip" 
-                    href="' . $delete_link_url . '" 
-                    aria-label="' . esc_attr__('Delete Registration Permanently', 'event_espresso') . '"
+                    href="' . $delete_link_url.'" 
+                    aria-label="' . esc_attr__('Delete Registration Permanently', 'event_espresso').'"
                 >
-                    ' . esc_html__('Delete', 'event_espresso') . '
+                    ' . esc_html__('Delete', 'event_espresso').'
                 </a>';
         }
         return $actions;
@@ -1113,7 +1113,7 @@ 
 
     private function editEventLink(int $EVT_ID, string $event_name): string
     {
-        if (! $EVT_ID || ! $this->caps_handler->userCanEditEvent($EVT_ID)) {
+        if ( ! $EVT_ID || ! $this->caps_handler->userCanEditEvent($EVT_ID)) {
             return $event_name;
         }
         $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
@@ -1121,31 +1121,31 @@ 
             EVENTS_ADMIN_URL
         );
         return '
-            <a class="ee-aria-tooltip ee-status-color--' . $this->_event_details['status'] . '" 
-                href="' . $edit_event_url . '" 
-                aria-label="' . esc_attr($this->_event_details['title_attr']) . '"
+            <a class="ee-aria-tooltip ee-status-color--' . $this->_event_details['status'].'" 
+                href="' . $edit_event_url.'" 
+                aria-label="' . esc_attr($this->_event_details['title_attr']).'"
             >
-                ' . $event_name . '
+                ' . $event_name.'
             </a>';
     }
 
 
     private function eventFilterLink(int $EVT_ID, string $event_name): string
     {
-        if (!$EVT_ID) {
+        if ( ! $EVT_ID) {
             return '';
         }
         $event_filter_url = EE_Admin_Page::add_query_args_and_nonce(['event_id' => $EVT_ID], REG_ADMIN_URL);
         return '
             <a  class="ee-aria-tooltip ee-event-filter-link" 
-                href="' . $event_filter_url . '" 
+                href="' . $event_filter_url.'" 
                 aria-label="' . sprintf(
                     esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
                     $event_name
-                ) . '"
+                ).'"
             >
                 <span class="dashicons dashicons-groups dashicons--small"></span>'
-                . esc_html__('View Registrations', 'event_espresso') . '
+                . esc_html__('View Registrations', 'event_espresso').'
             </a>';
     }
 }

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Indentation +1407 added lines, -1407 removed lines

@@ -19,1425 +19,1425 @@
  */
 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()
-    {
+	/**
+	 * @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;
-        // 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 '
+
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = wp_strip_all_tags(
+			esc_html__(
+				'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
+				'event_espresso'
+			)
+		);
+		EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(
+			esc_html__(
+				'An error occurred! Please refresh the page and try again.',
+				'event_espresso'
+			)
+		);
+		EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(
+			esc_html__(
+				'Are you sure you want to delete this State / Province?',
+				'event_espresso'
+			)
+		);
+		EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
+			'admin-ajax.php?page=espresso_general_settings',
+			is_ssl() ? 'https://' : 'http://'
+		);
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the default route.
+	 */
+	public function load_scripts_styles_default()
+	{
+		// styles
+		wp_enqueue_style('thickbox');
+		// scripts
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('thickbox');
+		wp_register_script(
+			'organization_settings',
+			GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+			['jquery', 'media-upload', 'thickbox'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('organization_settings');
+		wp_enqueue_style('organization-css');
+		$confirm_image_delete = [
+			'text' => wp_strip_all_tags(
+				esc_html__(
+					'Do you really want to delete this image? Please remember to save your settings to complete the removal.',
+					'event_espresso'
+				)
+			),
+		];
+		wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the country settings route.
+	 */
+	public function load_scripts_styles_country_settings()
+	{
+		// scripts
+		wp_register_script(
+			'gen_settings_countries',
+			GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+			['ee_admin_js'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('gen_settings_countries');
+		wp_enqueue_style('organization-css');
+	}
+
+
+	/*************        Espresso Pages        *************/
+	/**
+	 * _espresso_page_settings
+	 *
+	 * @throws EE_Error
+	 * @throws DomainException
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	protected function _espresso_page_settings()
+	{
+		// Check to make sure all of the main pages are set up properly,
+		// if not create the default pages and display an admin notice
+		EEH_Activation::verify_default_pages_exist();
+		$this->_transient_garbage_collection();
+
+		$this->_template_args['values']             = $this->_yes_no_values;
+
+		$this->_template_args['reg_page_id']        = $this->core_config->reg_page_id ?? null;
+		$this->_template_args['reg_page_obj']       = isset($this->core_config->reg_page_id)
+			? get_post($this->core_config->reg_page_id)
+			: false;
+
+		$this->_template_args['txn_page_id']        = $this->core_config->txn_page_id ?? null;
+		$this->_template_args['txn_page_obj']       = isset($this->core_config->txn_page_id)
+			? get_post($this->core_config->txn_page_id)
+			: false;
+
+		$this->_template_args['thank_you_page_id']  = $this->core_config->thank_you_page_id ?? null;
+		$this->_template_args['thank_you_page_obj'] = isset($this->core_config->thank_you_page_id)
+			? get_post($this->core_config->thank_you_page_id)
+			: false;
+
+		$this->_template_args['cancel_page_id']     = $this->core_config->cancel_page_id ?? null;
+		$this->_template_args['cancel_page_obj']    = isset($this->core_config->cancel_page_id)
+			? get_post($this->core_config->cancel_page_id)
+			: false;
+
+		$this->_set_add_edit_form_tags('update_espresso_page_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Handler for updating espresso page settings.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _update_espresso_page_settings()
+	{
+		$this->core_config = EE_Registry::instance()->CFG->core;
+		// capture incoming request data && set page IDs
+		$this->core_config->reg_page_id       = $this->request->getRequestParam(
+			'reg_page_id',
+			$this->core_config->reg_page_id,
+			DataType::INT
+		);
+		$this->core_config->txn_page_id       = $this->request->getRequestParam(
+			'txn_page_id',
+			$this->core_config->txn_page_id,
+			DataType::INT
+		);
+		$this->core_config->thank_you_page_id = $this->request->getRequestParam(
+			'thank_you_page_id',
+			$this->core_config->thank_you_page_id,
+			DataType::INT
+		);
+		$this->core_config->cancel_page_id    = $this->request->getRequestParam(
+			'cancel_page_id',
+			$this->core_config->cancel_page_id,
+			DataType::INT
+		);
+
+		$this->core_config = apply_filters(
+			'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
+			$this->core_config,
+			$this->request->requestParams()
+		);
+
+		$what = esc_html__('Critical Pages & Shortcodes', 'event_espresso');
+		$this->_redirect_after_action(
+			$this->_update_espresso_configuration(
+				$what,
+				$this->core_config,
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			),
+			$what,
+			'',
+			[
+				'action' => 'critical_pages',
+			],
+			true
+		);
+	}
+
+
+	/*************        Your Organization        *************/
+
+
+	/**
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _your_organization_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			/** @var OrganizationSettings $organization_settings_form */
+			$organization_settings_form = $this->loader->getShared(OrganizationSettings::class);
+
+			$this->_template_args['admin_page_content'] = EEH_HTML::div(
+				$organization_settings_form->display(),
+				'',
+				'padding'
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_your_organization_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Handler for updating organization settings.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _update_your_organization_settings()
+	{
+		try {
+			/** @var OrganizationSettings $organization_settings_form */
+			$organization_settings_form = $this->loader->getShared(OrganizationSettings::class);
+
+			$success = $organization_settings_form->process($this->request->requestParams());
+
+			EE_Registry::instance()->CFG = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
+				EE_Registry::instance()->CFG
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			$success = false;
+		}
+
+		if ($success) {
+			$success = $this->_update_espresso_configuration(
+				esc_html__('Your Organization Settings', 'event_espresso'),
+				EE_Registry::instance()->CFG,
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+
+		$this->_redirect_after_action($success, '', '', ['action' => 'default'], true);
+	}
+
+
+
+	/*************        Admin Options        *************/
+
+
+	/**
+	 * _admin_option_settings
+	 *
+	 * @throws EE_Error
+	 * @throws LogicException
+	 */
+	protected function _admin_option_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			// still need this for the old school form in Extend_General_Settings_Admin_Page
+			$this->_template_args['values'] = $this->_yes_no_values;
+			// also need to account for the do_action that was in the old template
+			$admin_options_settings_form->setTemplateArgs($this->_template_args);
+			$this->_template_args['admin_page_content'] = EEH_HTML::div(
+				$admin_options_settings_form->display(),
+				'',
+				'padding'
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_admin_option_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * _update_admin_option_settings
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormSubmissionException
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 */
+	protected function _update_admin_option_settings()
+	{
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			$admin_options_settings_form->process(
+				$this->request->getRequestParam(
+					$admin_options_settings_form->slug(),
+					[],
+					DataType::STRING,
+					true
+				)
+			);
+			EE_Registry::instance()->CFG->admin = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+				EE_Registry::instance()->CFG->admin
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_redirect_after_action(
+			apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
+				$this->_update_espresso_configuration(
+					esc_html__('Admin Options', 'event_espresso'),
+					EE_Registry::instance()->CFG->admin,
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				)
+			),
+			esc_html__('Admin Options', 'event_espresso'),
+			'updated',
+			['action' => 'admin_option_settings']
+		);
+	}
+
+
+	/*************        Countries        *************/
+
+
+	/**
+	 * @param string|null $default
+	 * @return string
+	 */
+	protected function getCountryISO(?string $default = null): string
+	{
+		$default = $default ?? $this->getCountryIsoForSite();
+		$CNT_ISO = $this->request->getRequestParam('country', $default);
+		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 +45 added lines, -45 removed lines

@@ -246,19 +246,19 @@ 
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(
+        EE_Registry::$i18n_js_strings['error_occurred'] = wp_strip_all_tags(
             esc_html__(
                 'An error occurred! Please refresh the page and try again.',
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(
+        EE_Registry::$i18n_js_strings['confirm_delete_state'] = wp_strip_all_tags(
             esc_html__(
                 'Are you sure you want to delete this State / Province?',
                 'event_espresso'
             )
         );
-        EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
+        EE_Registry::$i18n_js_strings['ajax_url'] = admin_url(
             'admin-ajax.php?page=espresso_general_settings',
             is_ssl() ? 'https://' : 'http://'
         );
@@ -287,12 +287,12 @@ 
         wp_enqueue_script('thickbox');
         wp_register_script(
             'organization_settings',
-            GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+            GEN_SET_ASSETS_URL.'your_organization_settings.js',
             ['jquery', 'media-upload', 'thickbox'],
             EVENT_ESPRESSO_VERSION,
             true
         );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+        wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', [], EVENT_ESPRESSO_VERSION);
         wp_enqueue_script('organization_settings');
         wp_enqueue_style('organization-css');
         $confirm_image_delete = [
@@ -315,12 +315,12 @@ 
         // scripts
         wp_register_script(
             'gen_settings_countries',
-            GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+            GEN_SET_ASSETS_URL.'gen_settings_countries.js',
             ['ee_admin_js'],
             EVENT_ESPRESSO_VERSION,
             true
         );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+        wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', [], EVENT_ESPRESSO_VERSION);
         wp_enqueue_script('gen_settings_countries');
         wp_enqueue_style('organization-css');
     }
@@ -368,7 +368,7 @@ 
         $this->_set_add_edit_form_tags('update_espresso_page_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+            GEN_SET_TEMPLATE_PATH.'espresso_page_settings.template.php',
             $this->_template_args,
             true
         );
@@ -385,12 +385,12 @@ 
     {
 		$this->core_config = EE_Registry::instance()->CFG->core;
         // 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
@@ -934,8 +934,8 @@ 
                         GEN_SET_ADMIN_URL
                     );
 
-                    $this->_template_args['states'][ $STA_ID ]['inputs']           = $inputs;
-                    $this->_template_args['states'][ $STA_ID ]['delete_state_url'] = $delete_state_url;
+                    $this->_template_args['states'][$STA_ID]['inputs']           = $inputs;
+                    $this->_template_args['states'][$STA_ID]['delete_state_url'] = $delete_state_url;
                 }
             }
         } else {
@@ -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__,
@@ -1095,7 +1095,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__,
@@ -1119,15 +1119,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()
         );
@@ -1144,15 +1144,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
@@ -1175,7 +1175,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 = [
@@ -1233,7 +1233,7 @@ 
         return '
 			<tr>
 				<th>
-					' . $label . '
+					' . $label.'
 				</th>';
     }
 
@@ -1248,7 +1248,7 @@ 
     {
         return '
 				<td class="general-settings-country-input-td">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
     }
@@ -1277,7 +1277,7 @@ 
     {
         return '
 				<td class="general-settings-country-state-input-td">
-					' . $input . '
+					' . $input.'
 				</td>';
     }
 
@@ -1297,9 +1297,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;
     }
@@ -1333,8 +1333,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>';
     }
 
 
@@ -1354,7 +1354,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
@@ -1369,8 +1369,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}";