eventespresso / event-espresso-core

caffeinated/modules/event_single_caff/EED_Event_Single_Caff.module.php

Indentation +223 added lines, -223 removed lines

@@ -11,246 +11,246 @@
  */
 class EED_Event_Single_Caff extends EED_Event_Single
 {
-    /**
-     * @return EED_Event_Single_Caff
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Event_Single_Caff
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
 
 
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-    }
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+	}
 
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        self::setDefinitions();
-        add_action(
-            'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
-            ['EED_Event_Single_Caff', 'load_scripts_styles'],
-            10
-        );
-        add_action(
-            'AHEE__template_settings__template__before_settings_form',
-            ['EED_Event_Single_Caff', 'template_settings_form'],
-            10
-        );
-        add_filter(
-            'FHEE__General_Settings_Admin_Page__update_template_settings__data',
-            ['EED_Event_Single_Caff', 'update_template_settings'],
-            10,
-            2
-        );
-        // AJAX
-        add_action(
-            'wp_ajax_espresso_update_event_single_order',
-            ['EED_Event_Single_Caff', 'update_event_single_order']
-        );
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		self::setDefinitions();
+		add_action(
+			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
+			['EED_Event_Single_Caff', 'load_scripts_styles'],
+			10
+		);
+		add_action(
+			'AHEE__template_settings__template__before_settings_form',
+			['EED_Event_Single_Caff', 'template_settings_form'],
+			10
+		);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page__update_template_settings__data',
+			['EED_Event_Single_Caff', 'update_template_settings'],
+			10,
+			2
+		);
+		// AJAX
+		add_action(
+			'wp_ajax_espresso_update_event_single_order',
+			['EED_Event_Single_Caff', 'update_event_single_order']
+		);
+	}
 
 
-    public static function load_scripts_styles()
-    {
-        add_action('admin_enqueue_scripts', ['EED_Event_Single_Caff', 'enqueue_scripts_styles'], 10);
-    }
+	public static function load_scripts_styles()
+	{
+		add_action('admin_enqueue_scripts', ['EED_Event_Single_Caff', 'enqueue_scripts_styles'], 10);
+	}
 
 
-    public static function enqueue_scripts_styles()
-    {
-        wp_register_style(
-            'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('eed-event-single-sortable');
-        wp_register_script(
-            'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js',
-            ['espresso_core', 'jquery-ui-sortable'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('eed-event-single-sortable');
-    }
+	public static function enqueue_scripts_styles()
+	{
+		wp_register_style(
+			'eed-event-single-sortable',
+			EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('eed-event-single-sortable');
+		wp_register_script(
+			'eed-event-single-sortable',
+			EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js',
+			['espresso_core', 'jquery-ui-sortable'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('eed-event-single-sortable');
+	}
 
 
-    /**
-     * Set constants only if they haven't been set yet.
-     */
-    public static function setDefinitions()
-    {
-        if (! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
-            define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
-            define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        }
-    }
+	/**
+	 * Set constants only if they haven't been set yet.
+	 */
+	public static function setDefinitions()
+	{
+		if (! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
+			define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
+			define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+		}
+	}
 
 
-    /**
-     *    template_settings_form
-     *
-     * @access    public
-     * @static
-     * @return    void
-     * @throws EE_Error
-     */
-    public static function template_settings_form()
-    {
-        $config                             = EE_Registry::instance()->CFG->template_settings;
-        $config                             =
-            isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config
-                ? $config->EED_Event_Single : new EE_Event_Single_Config();
-        $config->use_sortable_display_order = $config->use_sortable_display_order ?? false;
-        $config                             =
-            apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
+	/**
+	 *    template_settings_form
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 * @throws EE_Error
+	 */
+	public static function template_settings_form()
+	{
+		$config                             = EE_Registry::instance()->CFG->template_settings;
+		$config                             =
+			isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config
+				? $config->EED_Event_Single : new EE_Event_Single_Config();
+		$config->use_sortable_display_order = $config->use_sortable_display_order ?? false;
+		$config                             =
+			apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
 
-        $event_single_order_array                                     = [];
-        $event_single_order_array[ $config->display_order_tickets ]   = 'tickets';
-        $event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
-        $event_single_order_array[ $config->display_order_event ]     = 'event';
-        $event_single_order_array[ $config->display_order_venue ]     = 'venue';
-        // get template parts
-        $template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
-        // convert to array so that we can add more properties
-        $config                               = get_object_vars($config);
-        $config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts(
-            'event-single-sortable-js',
-            '',
-            'single-sortable-li single-sortable-js'
-        );
-        EEH_Template::display_template(
-            EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php',
-            $config
-        );
-    }
+		$event_single_order_array                                     = [];
+		$event_single_order_array[ $config->display_order_tickets ]   = 'tickets';
+		$event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
+		$event_single_order_array[ $config->display_order_event ]     = 'event';
+		$event_single_order_array[ $config->display_order_venue ]     = 'venue';
+		// get template parts
+		$template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
+		// convert to array so that we can add more properties
+		$config                               = get_object_vars($config);
+		$config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts(
+			'event-single-sortable-js',
+			'',
+			'single-sortable-li single-sortable-js'
+		);
+		EEH_Template::display_template(
+			EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php',
+			$config
+		);
+	}
 
 
-    /**
-     * update_template_settings
-     *
-     * @param EE_Template_Config $CFG
-     * @param array              $REQ
-     * @return EE_Template_Config
-     */
-    public static function update_template_settings(EE_Template_Config $CFG, $REQ): EE_Template_Config
-    {
-        /** @var EE_Capabilities $capabilities */
-        $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
-            wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
-        }
-        if (! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
-            $CFG->EED_Event_Single = new EE_Event_Single_Config();
-        }
-        $display_order_event                                 = $CFG->EED_Event_Single->display_order_event !== null
-            ? $CFG->EED_Event_Single->display_order_event
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
-        $display_order_datetimes                             = $CFG->EED_Event_Single->display_order_datetimes !== null
-            ? $CFG->EED_Event_Single->display_order_datetimes
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
-        $display_order_tickets                               = $CFG->EED_Event_Single->display_order_tickets !== null
-            ? $CFG->EED_Event_Single->display_order_tickets
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
-        $display_order_venue                                 = $CFG->EED_Event_Single->display_order_venue !== null
-            ? $CFG->EED_Event_Single->display_order_venue
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
-        $CFG->EED_Event_Single                               = new EE_Event_Single_Config();
-        $CFG->EED_Event_Single->display_status_banner_single = $REQ['display_status_banner_single'] ?? false;
-        $CFG->EED_Event_Single->display_venue                = $REQ['display_venue'] ?? false;
-        $CFG->EED_Event_Single->use_sortable_display_order   =
-            ! empty($REQ['EED_Events_Single_use_sortable_display_order'])
-                ? absint($REQ['EED_Events_Single_use_sortable_display_order'])
-                : 0;
-        $CFG->EED_Event_Single->display_order_event          = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_event
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
-        $CFG->EED_Event_Single->display_order_datetimes      = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_datetimes
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
-        $CFG->EED_Event_Single->display_order_tickets        = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_tickets
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
-        $CFG->EED_Event_Single->display_order_venue          = $CFG->EED_Event_Single->use_sortable_display_order
-            ? $display_order_venue
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
-        do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
-        return $CFG;
-    }
+	/**
+	 * update_template_settings
+	 *
+	 * @param EE_Template_Config $CFG
+	 * @param array              $REQ
+	 * @return EE_Template_Config
+	 */
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ): EE_Template_Config
+	{
+		/** @var EE_Capabilities $capabilities */
+		$capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
+		if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+			wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
+		}
+		if (! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
+			$CFG->EED_Event_Single = new EE_Event_Single_Config();
+		}
+		$display_order_event                                 = $CFG->EED_Event_Single->display_order_event !== null
+			? $CFG->EED_Event_Single->display_order_event
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
+		$display_order_datetimes                             = $CFG->EED_Event_Single->display_order_datetimes !== null
+			? $CFG->EED_Event_Single->display_order_datetimes
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
+		$display_order_tickets                               = $CFG->EED_Event_Single->display_order_tickets !== null
+			? $CFG->EED_Event_Single->display_order_tickets
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
+		$display_order_venue                                 = $CFG->EED_Event_Single->display_order_venue !== null
+			? $CFG->EED_Event_Single->display_order_venue
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
+		$CFG->EED_Event_Single                               = new EE_Event_Single_Config();
+		$CFG->EED_Event_Single->display_status_banner_single = $REQ['display_status_banner_single'] ?? false;
+		$CFG->EED_Event_Single->display_venue                = $REQ['display_venue'] ?? false;
+		$CFG->EED_Event_Single->use_sortable_display_order   =
+			! empty($REQ['EED_Events_Single_use_sortable_display_order'])
+				? absint($REQ['EED_Events_Single_use_sortable_display_order'])
+				: 0;
+		$CFG->EED_Event_Single->display_order_event          = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_event
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
+		$CFG->EED_Event_Single->display_order_datetimes      = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_datetimes
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
+		$CFG->EED_Event_Single->display_order_tickets        = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_tickets
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
+		$CFG->EED_Event_Single->display_order_venue          = $CFG->EED_Event_Single->use_sortable_display_order
+			? $display_order_venue
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
+		do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
+		return $CFG;
+	}
 
 
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function update_event_single_order()
-    {
-        /** @var EE_Capabilities $capabilities */
-        $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
-            wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
-        }
-        if (
-            ! isset(EE_Registry::instance()->CFG->template_settings->EED_Event_Single)
-            || ! EE_Registry::instance()->CFG->template_settings->EED_Event_Single instanceof EE_Event_Single_Config
-        ) {
-            EE_Registry::instance()->CFG->template_settings->EED_Event_Single = new EE_Event_Single_Config();
-        }
-        $config_saved   = false;
-        $template_parts = EED_Event_Single_Caff::getRequest()->getRequestParam('elements');
-        if (! empty($template_parts)) {
-            $template_parts = explode(',', trim($template_parts, ','));
-            foreach ($template_parts as $key => $template_part) {
-                $template_part                                                                      =
-                    "display_order_$template_part";
-                $priority                                                                           =
-                    ($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
-                EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
-                do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
-            }
-            $config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
-        }
-        if ($config_saved) {
-            EE_Error::add_success(esc_html__('Display Order has been successfully updated.', 'event_espresso'));
-        } else {
-            EE_Error::add_error(
-                esc_html__('Display Order was not updated.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        echo wp_json_encode(EE_Error::get_notices(false));
-        exit();
-    }
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function update_event_single_order()
+	{
+		/** @var EE_Capabilities $capabilities */
+		$capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
+		if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+			wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
+		}
+		if (
+			! isset(EE_Registry::instance()->CFG->template_settings->EED_Event_Single)
+			|| ! EE_Registry::instance()->CFG->template_settings->EED_Event_Single instanceof EE_Event_Single_Config
+		) {
+			EE_Registry::instance()->CFG->template_settings->EED_Event_Single = new EE_Event_Single_Config();
+		}
+		$config_saved   = false;
+		$template_parts = EED_Event_Single_Caff::getRequest()->getRequestParam('elements');
+		if (! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
+				$template_part                                                                      =
+					"display_order_$template_part";
+				$priority                                                                           =
+					($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
+				EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
+				do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
+			}
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
+		}
+		if ($config_saved) {
+			EE_Error::add_success(esc_html__('Display Order has been successfully updated.', 'event_espresso'));
+		} else {
+			EE_Error::add_error(
+				esc_html__('Display Order was not updated.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		echo wp_json_encode(EE_Error::get_notices(false));
+		exit();
+	}
 
 
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @param WP $WP
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -76,14 +76,14 @@ 
     {
         wp_register_style(
             'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css',
+            EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css',
             [],
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_style('eed-event-single-sortable');
         wp_register_script(
             'eed-event-single-sortable',
-            EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js',
+            EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js',
             ['espresso_core', 'jquery-ui-sortable'],
             EVENT_ESPRESSO_VERSION,
             true
@@ -97,9 +97,9 @@ 
      */
     public static function setDefinitions()
     {
-        if (! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
-            define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
-            define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+        if ( ! defined('EVENT_SINGLE_CAFF_TEMPLATES_PATH')) {
+            define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates/');
+            define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets/');
         }
     }
 
@@ -123,10 +123,10 @@ 
             apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
 
         $event_single_order_array                                     = [];
-        $event_single_order_array[ $config->display_order_tickets ]   = 'tickets';
-        $event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
-        $event_single_order_array[ $config->display_order_event ]     = 'event';
-        $event_single_order_array[ $config->display_order_venue ]     = 'venue';
+        $event_single_order_array[$config->display_order_tickets]   = 'tickets';
+        $event_single_order_array[$config->display_order_datetimes] = 'datetimes';
+        $event_single_order_array[$config->display_order_event]     = 'event';
+        $event_single_order_array[$config->display_order_venue]     = 'venue';
         // get template parts
         $template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
         // convert to array so that we can add more properties
@@ -137,7 +137,7 @@ 
             'single-sortable-li single-sortable-js'
         );
         EEH_Template::display_template(
-            EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php',
+            EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php',
             $config
         );
     }
@@ -154,10 +154,10 @@ 
     {
         /** @var EE_Capabilities $capabilities */
         $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+        if ( ! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
             wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
         }
-        if (! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
+        if ( ! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
             $CFG->EED_Event_Single = new EE_Event_Single_Config();
         }
         $display_order_event                                 = $CFG->EED_Event_Single->display_order_event !== null
@@ -205,7 +205,7 @@ 
     {
         /** @var EE_Capabilities $capabilities */
         $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+        if ( ! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
             wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
         }
         if (
@@ -216,7 +216,7 @@ 
         }
         $config_saved   = false;
         $template_parts = EED_Event_Single_Caff::getRequest()->getRequestParam('elements');
-        if (! empty($template_parts)) {
+        if ( ! empty($template_parts)) {
             $template_parts = explode(',', trim($template_parts, ','));
             foreach ($template_parts as $key => $template_part) {
                 $template_part                                                                      =

caffeinated/modules/events_archive_caff/EED_Events_Archive_Caff.module.php

Indentation +250 added lines, -250 removed lines

@@ -14,275 +14,275 @@
  */
 class EED_Events_Archive_Caff extends EED_Events_Archive
 {
-    /**
-     * @return EED_Events_Archive_Caff|EED_Module
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Events_Archive_Caff|EED_Module
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
 
 
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-    }
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+	}
 
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        self::setDefinitions();
-        add_action(
-            'AHEE__template_settings__template__before_settings_form',
-            ['EED_Events_Archive_Caff', 'template_settings_form']
-        );
-        add_filter(
-            'FHEE__General_Settings_Admin_Page__update_template_settings__data',
-            ['EED_Events_Archive_Caff', 'update_template_settings'],
-            10,
-            2
-        );
-        // AJAX
-        add_action(
-            'wp_ajax_espresso_update_event_archive_order',
-            ['EED_Events_Archive_Caff', 'update_event_archive_order']
-        );
-        add_action(
-            'wp_ajax_nopriv_espresso_update_event_archive_order',
-            ['EED_Events_Archive_Caff', 'update_event_archive_order']
-        );
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		self::setDefinitions();
+		add_action(
+			'AHEE__template_settings__template__before_settings_form',
+			['EED_Events_Archive_Caff', 'template_settings_form']
+		);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page__update_template_settings__data',
+			['EED_Events_Archive_Caff', 'update_template_settings'],
+			10,
+			2
+		);
+		// AJAX
+		add_action(
+			'wp_ajax_espresso_update_event_archive_order',
+			['EED_Events_Archive_Caff', 'update_event_archive_order']
+		);
+		add_action(
+			'wp_ajax_nopriv_espresso_update_event_archive_order',
+			['EED_Events_Archive_Caff', 'update_event_archive_order']
+		);
+	}
 
 
-    /**
-     * run - initial module setup
-     *
-     * @param WP $WP
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
+	/**
+	 * run - initial module setup
+	 *
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
 
 
-    /**
-     * Conditionally set constants if they haven't been defined yet.
-     */
-    public static function setDefinitions()
-    {
-        if (! defined('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH')) {
-            define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
-            define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        }
-    }
+	/**
+	 * Conditionally set constants if they haven't been defined yet.
+	 */
+	public static function setDefinitions()
+	{
+		if (! defined('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH')) {
+			define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
+			define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+		}
+	}
 
 
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function template_settings_form()
-    {
-        /** @var EE_Admin_Page_Loader $admin_page_loader */
-        $admin_page_loader = LoaderFactory::getLoader()->getShared('EE_Admin_Page_Loader');
-        // grab general settings admin page and remove the existing hook callback
-        $gen_set_admin = $admin_page_loader->get_admin_page_object('general_settings');
-        if ($gen_set_admin instanceof General_Settings_Admin_Page) {
-            remove_action(
-                'AHEE__template_settings__template__before_settings_form',
-                [$gen_set_admin, 'template_settings_caff_features'],
-                100
-            );
-        }
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function template_settings_form()
+	{
+		/** @var EE_Admin_Page_Loader $admin_page_loader */
+		$admin_page_loader = LoaderFactory::getLoader()->getShared('EE_Admin_Page_Loader');
+		// grab general settings admin page and remove the existing hook callback
+		$gen_set_admin = $admin_page_loader->get_admin_page_object('general_settings');
+		if ($gen_set_admin instanceof General_Settings_Admin_Page) {
+			remove_action(
+				'AHEE__template_settings__template__before_settings_form',
+				[$gen_set_admin, 'template_settings_caff_features'],
+				100
+			);
+		}
 
-        // first just grab the template settings
-        $config = EE_Registry::instance()->CFG->template_settings;
-        // then if the Event Archive config is valid, use that, else create a new one
-        $config = $config instanceof EE_Template_Config
-        && $config->EED_Events_Archive instanceof EE_Events_Archive_Config
-            ? $config->EED_Events_Archive
-            : new EE_Events_Archive_Config();
-        /** @var EE_Events_Archive_Config $config */
-        $config = apply_filters(
-            'FHEE__EED_Events_Archive__template_settings_form__event_list_config',
-            $config
-        );
+		// first just grab the template settings
+		$config = EE_Registry::instance()->CFG->template_settings;
+		// then if the Event Archive config is valid, use that, else create a new one
+		$config = $config instanceof EE_Template_Config
+		&& $config->EED_Events_Archive instanceof EE_Events_Archive_Config
+			? $config->EED_Events_Archive
+			: new EE_Events_Archive_Config();
+		/** @var EE_Events_Archive_Config $config */
+		$config = apply_filters(
+			'FHEE__EED_Events_Archive__template_settings_form__event_list_config',
+			$config
+		);
 
-        $config->display_status_banner               = $config->display_status_banner ?? false;
-        $config->display_description                 = $config->display_description ?? true;
-        $config->display_ticket_selector             = $config->display_ticket_selector ?? false;
-        $config->display_datetimes                   = $config->display_datetimes ?? true;
-        $config->display_venue                       = $config->display_venue ?? false;
-        $config->display_expired_events              = $config->display_expired_events ?? false;
-        $config->display_events_with_expired_tickets = $config->display_events_with_expired_tickets ?? false;
-        // display order options
-        $config->use_sortable_display_order = $config->use_sortable_display_order ?? false;
-        $config->display_order_event        = $config->display_order_event ?? 100;
-        $config->display_order_datetimes    = $config->display_order_datetimes ?? 110;
-        $config->display_order_tickets      = $config->display_order_tickets ?? 120;
-        $config->display_order_venue        = $config->display_order_venue ?? 130;
+		$config->display_status_banner               = $config->display_status_banner ?? false;
+		$config->display_description                 = $config->display_description ?? true;
+		$config->display_ticket_selector             = $config->display_ticket_selector ?? false;
+		$config->display_datetimes                   = $config->display_datetimes ?? true;
+		$config->display_venue                       = $config->display_venue ?? false;
+		$config->display_expired_events              = $config->display_expired_events ?? false;
+		$config->display_events_with_expired_tickets = $config->display_events_with_expired_tickets ?? false;
+		// display order options
+		$config->use_sortable_display_order = $config->use_sortable_display_order ?? false;
+		$config->display_order_event        = $config->display_order_event ?? 100;
+		$config->display_order_datetimes    = $config->display_order_datetimes ?? 110;
+		$config->display_order_tickets      = $config->display_order_tickets ?? 120;
+		$config->display_order_venue        = $config->display_order_venue ?? 130;
 
-        // get template parts
-        $template_parts = EED_Events_Archive::instance()->initialize_template_parts($config);
-        // convert to array so that we can add more properties
-        $config                                = get_object_vars($config);
-        $config['event_archive_display_order'] = $template_parts->generate_sortable_list_of_template_parts(
-            'event-archive-sortable-js',
-            '',
-            'archive-sortable-li archive-sortable-js'
-        );
-        EEH_Template::display_template(
-            EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
-            $config
-        );
-    }
+		// get template parts
+		$template_parts = EED_Events_Archive::instance()->initialize_template_parts($config);
+		// convert to array so that we can add more properties
+		$config                                = get_object_vars($config);
+		$config['event_archive_display_order'] = $template_parts->generate_sortable_list_of_template_parts(
+			'event-archive-sortable-js',
+			'',
+			'archive-sortable-li archive-sortable-js'
+		);
+		EEH_Template::display_template(
+			EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
+			$config
+		);
+	}
 
 
-    /**
-     * @param EE_Template_Config $CFG
-     * @param array              $REQ
-     * @return EE_Template_Config
-     */
-    public static function update_template_settings(EE_Template_Config $CFG, array $REQ): EE_Template_Config
-    {
-        /** @var EE_Capabilities $capabilities */
-        $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
-            wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
-        }
-        $request                   = EED_Module::getRequest();
-        $reset_event_list_settings = $request->getRequestParam(
-            'EED_Events_Archive_reset_event_list_settings',
-            false,
-            DataType::BOOL
-        );
-        if ($reset_event_list_settings) {
-            $config = new EE_Events_Archive_Config();
-            return EED_Events_Archive_Caff::afterUpdateTemplateSettings($CFG, $config, $REQ);
-        }
-        /** @var EE_Events_Archive_Config $config */
-        $config = $CFG->EED_Events_Archive instanceof EE_Events_Archive_Config
-            ? $CFG->EED_Events_Archive
-            : new EE_Events_Archive_Config();
+	/**
+	 * @param EE_Template_Config $CFG
+	 * @param array              $REQ
+	 * @return EE_Template_Config
+	 */
+	public static function update_template_settings(EE_Template_Config $CFG, array $REQ): EE_Template_Config
+	{
+		/** @var EE_Capabilities $capabilities */
+		$capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
+		if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+			wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
+		}
+		$request                   = EED_Module::getRequest();
+		$reset_event_list_settings = $request->getRequestParam(
+			'EED_Events_Archive_reset_event_list_settings',
+			false,
+			DataType::BOOL
+		);
+		if ($reset_event_list_settings) {
+			$config = new EE_Events_Archive_Config();
+			return EED_Events_Archive_Caff::afterUpdateTemplateSettings($CFG, $config, $REQ);
+		}
+		/** @var EE_Events_Archive_Config $config */
+		$config = $CFG->EED_Events_Archive instanceof EE_Events_Archive_Config
+			? $CFG->EED_Events_Archive
+			: new EE_Events_Archive_Config();
 
-        $config->display_status_banner               = $request->getRequestParam(
-            'EED_Events_Archive_display_status_banner',
-            false,
-            DataType::BOOL
-        );
-        $config->display_description                 = $request->getRequestParam(
-            'EED_Events_Archive_display_description',
-            1,
-            DataType::INT
-        );
-        $config->display_ticket_selector             = $request->getRequestParam(
-            'EED_Events_Archive_display_ticket_selector',
-            false,
-            DataType::BOOL
-        );
-        $config->display_datetimes                   = $request->getRequestParam(
-            'EED_Events_Archive_display_datetimes',
-            true,
-            DataType::BOOL
-        );
-        $config->display_venue                       = $request->getRequestParam(
-            'EED_Events_Archive_display_venue',
-            false,
-            DataType::BOOL
-        );
-        $config->display_expired_events              = $request->getRequestParam(
-            'EED_Events_Archive_display_expired_events',
-            false,
-            DataType::BOOL
-        );
-        $config->display_events_with_expired_tickets = $request->getRequestParam(
-            'EED_Events_Archive_display_events_with_expired_tickets',
-            false,
-            DataType::BOOL
-        );
-        $config->use_sortable_display_order          = $request->getRequestParam(
-            'EED_Events_Archive_use_sortable_display_order',
-            false,
-            DataType::BOOL
-        );
-        if (! $config->use_sortable_display_order) {
-            $config->display_order_event     = EED_Events_Archive::EVENT_DETAILS_PRIORITY;
-            $config->display_order_datetimes = EED_Events_Archive::EVENT_DATETIMES_PRIORITY;
-            $config->display_order_tickets   = EED_Events_Archive::EVENT_TICKETS_PRIORITY;
-            $config->display_order_venue     = EED_Events_Archive::EVENT_VENUES_PRIORITY;
-        }
+		$config->display_status_banner               = $request->getRequestParam(
+			'EED_Events_Archive_display_status_banner',
+			false,
+			DataType::BOOL
+		);
+		$config->display_description                 = $request->getRequestParam(
+			'EED_Events_Archive_display_description',
+			1,
+			DataType::INT
+		);
+		$config->display_ticket_selector             = $request->getRequestParam(
+			'EED_Events_Archive_display_ticket_selector',
+			false,
+			DataType::BOOL
+		);
+		$config->display_datetimes                   = $request->getRequestParam(
+			'EED_Events_Archive_display_datetimes',
+			true,
+			DataType::BOOL
+		);
+		$config->display_venue                       = $request->getRequestParam(
+			'EED_Events_Archive_display_venue',
+			false,
+			DataType::BOOL
+		);
+		$config->display_expired_events              = $request->getRequestParam(
+			'EED_Events_Archive_display_expired_events',
+			false,
+			DataType::BOOL
+		);
+		$config->display_events_with_expired_tickets = $request->getRequestParam(
+			'EED_Events_Archive_display_events_with_expired_tickets',
+			false,
+			DataType::BOOL
+		);
+		$config->use_sortable_display_order          = $request->getRequestParam(
+			'EED_Events_Archive_use_sortable_display_order',
+			false,
+			DataType::BOOL
+		);
+		if (! $config->use_sortable_display_order) {
+			$config->display_order_event     = EED_Events_Archive::EVENT_DETAILS_PRIORITY;
+			$config->display_order_datetimes = EED_Events_Archive::EVENT_DATETIMES_PRIORITY;
+			$config->display_order_tickets   = EED_Events_Archive::EVENT_TICKETS_PRIORITY;
+			$config->display_order_venue     = EED_Events_Archive::EVENT_VENUES_PRIORITY;
+		}
 
-        return EED_Events_Archive_Caff::afterUpdateTemplateSettings($CFG, $config, $REQ);
-    }
+		return EED_Events_Archive_Caff::afterUpdateTemplateSettings($CFG, $config, $REQ);
+	}
 
 
-    private static function afterUpdateTemplateSettings(
-        EE_Template_Config $CFG,
-        EE_Events_Archive_Config $config,
-        array $REQ
-    ): EE_Template_Config {
-        $CFG->EED_Events_Archive = $config;
-        do_action('AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ);
-        return $CFG;
-    }
+	private static function afterUpdateTemplateSettings(
+		EE_Template_Config $CFG,
+		EE_Events_Archive_Config $config,
+		array $REQ
+	): EE_Template_Config {
+		$CFG->EED_Events_Archive = $config;
+		do_action('AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ);
+		return $CFG;
+	}
 
 
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function update_event_archive_order()
-    {
-        /** @var EE_Capabilities $capabilities */
-        $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
-            wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
-        }
-        $config         = EE_Registry::instance()->CFG;
-        $config_saved   = false;
-        $template_parts = EED_Events_Archive_Caff::getRequest()->getRequestParam('elements');
-        if (! empty($template_parts)) {
-            $template_parts = explode(',', trim($template_parts, ','));
-            foreach ($template_parts as $key => $template_part) {
-                $template_part = "display_order_$template_part";
-                $priority      = ($key * 10) + EED_Events_Archive::EVENT_DETAILS_PRIORITY;
-                if (
-                    $config->template_settings->EED_Events_Archive instanceof EE_Events_Archive_Config
-                    && property_exists(
-                        $config->template_settings->EED_Events_Archive,
-                        $template_part
-                    )
-                ) {
-                    $config->template_settings->EED_Events_Archive->{$template_part} = $priority;
-                }
-                do_action("AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority);
-            }
-            $config_saved = $config->update_espresso_config(false, false);
-        }
-        if ($config_saved) {
-            EE_Error::add_success(esc_html__('Display Order has been successfully updated.', 'event_espresso'));
-        } else {
-            EE_Error::add_error(
-                esc_html__('Display Order was not updated.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        wp_send_json(EE_Error::get_notices(false));
-    }
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function update_event_archive_order()
+	{
+		/** @var EE_Capabilities $capabilities */
+		$capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
+		if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+			wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
+		}
+		$config         = EE_Registry::instance()->CFG;
+		$config_saved   = false;
+		$template_parts = EED_Events_Archive_Caff::getRequest()->getRequestParam('elements');
+		if (! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
+				$template_part = "display_order_$template_part";
+				$priority      = ($key * 10) + EED_Events_Archive::EVENT_DETAILS_PRIORITY;
+				if (
+					$config->template_settings->EED_Events_Archive instanceof EE_Events_Archive_Config
+					&& property_exists(
+						$config->template_settings->EED_Events_Archive,
+						$template_part
+					)
+				) {
+					$config->template_settings->EED_Events_Archive->{$template_part} = $priority;
+				}
+				do_action("AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority);
+			}
+			$config_saved = $config->update_espresso_config(false, false);
+		}
+		if ($config_saved) {
+			EE_Error::add_success(esc_html__('Display Order has been successfully updated.', 'event_espresso'));
+		} else {
+			EE_Error::add_error(
+				esc_html__('Display Order was not updated.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		wp_send_json(EE_Error::get_notices(false));
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -82,9 +82,9 @@ 
      */
     public static function setDefinitions()
     {
-        if (! defined('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH')) {
-            define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates/');
-            define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+        if ( ! defined('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH')) {
+            define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates/');
+            define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets/');
         }
     }
 
@@ -145,7 +145,7 @@ 
             'archive-sortable-li archive-sortable-js'
         );
         EEH_Template::display_template(
-            EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
+            EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php',
             $config
         );
     }
@@ -160,7 +160,7 @@ 
     {
         /** @var EE_Capabilities $capabilities */
         $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+        if ( ! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
             wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
         }
         $request                   = EED_Module::getRequest();
@@ -178,32 +178,32 @@ 
             ? $CFG->EED_Events_Archive
             : new EE_Events_Archive_Config();
 
-        $config->display_status_banner               = $request->getRequestParam(
+        $config->display_status_banner = $request->getRequestParam(
             'EED_Events_Archive_display_status_banner',
             false,
             DataType::BOOL
         );
-        $config->display_description                 = $request->getRequestParam(
+        $config->display_description = $request->getRequestParam(
             'EED_Events_Archive_display_description',
             1,
             DataType::INT
         );
-        $config->display_ticket_selector             = $request->getRequestParam(
+        $config->display_ticket_selector = $request->getRequestParam(
             'EED_Events_Archive_display_ticket_selector',
             false,
             DataType::BOOL
         );
-        $config->display_datetimes                   = $request->getRequestParam(
+        $config->display_datetimes = $request->getRequestParam(
             'EED_Events_Archive_display_datetimes',
             true,
             DataType::BOOL
         );
-        $config->display_venue                       = $request->getRequestParam(
+        $config->display_venue = $request->getRequestParam(
             'EED_Events_Archive_display_venue',
             false,
             DataType::BOOL
         );
-        $config->display_expired_events              = $request->getRequestParam(
+        $config->display_expired_events = $request->getRequestParam(
             'EED_Events_Archive_display_expired_events',
             false,
             DataType::BOOL
@@ -213,12 +213,12 @@ 
             false,
             DataType::BOOL
         );
-        $config->use_sortable_display_order          = $request->getRequestParam(
+        $config->use_sortable_display_order = $request->getRequestParam(
             'EED_Events_Archive_use_sortable_display_order',
             false,
             DataType::BOOL
         );
-        if (! $config->use_sortable_display_order) {
+        if ( ! $config->use_sortable_display_order) {
             $config->display_order_event     = EED_Events_Archive::EVENT_DETAILS_PRIORITY;
             $config->display_order_datetimes = EED_Events_Archive::EVENT_DATETIMES_PRIORITY;
             $config->display_order_tickets   = EED_Events_Archive::EVENT_TICKETS_PRIORITY;
@@ -249,13 +249,13 @@ 
     {
         /** @var EE_Capabilities $capabilities */
         $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+        if ( ! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
             wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
         }
         $config         = EE_Registry::instance()->CFG;
         $config_saved   = false;
         $template_parts = EED_Events_Archive_Caff::getRequest()->getRequestParam('elements');
-        if (! empty($template_parts)) {
+        if ( ! empty($template_parts)) {
             $template_parts = explode(',', trim($template_parts, ','));
             foreach ($template_parts as $key => $template_part) {
                 $template_part = "display_order_$template_part";

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Indentation +297 added lines, -297 removed lines

@@ -16,321 +16,321 @@
  */
 class EED_Ticket_Selector_Caff extends EED_Ticket_Selector
 {
-    /**
-     * @return EED_Module|EED_Ticket_Selector_Caff
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance()
-    {
-        return EED_Module::get_instance(__CLASS__);
-    }
+	/**
+	 * @return EED_Module|EED_Ticket_Selector_Caff
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance()
+	{
+		return EED_Module::get_instance(__CLASS__);
+	}
 
 
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        add_action(
-            'AHEE__ticket_selector_chart_template__ticket_details__after_description',
-            array('EED_Ticket_Selector_Caff', 'ticket_price_details'),
-            10,
-            3
-        );
-    }
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		add_action(
+			'AHEE__ticket_selector_chart_template__ticket_details__after_description',
+			array('EED_Ticket_Selector_Caff', 'ticket_price_details'),
+			10,
+			3
+		);
+	}
 
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        define(
-            'TICKET_SELECTOR_CAFF_TEMPLATES_PATH',
-            str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
-        );
-        add_action(
-            'AHEE__template_settings__template__before_settings_form',
-            array('EED_Ticket_Selector_Caff', 'template_settings_form')
-        );
-        add_filter(
-            'FHEE__General_Settings_Admin_Page__update_template_settings__data',
-            array('EED_Ticket_Selector_Caff', 'update_template_settings'),
-            10,
-            2
-        );
-    }
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		define(
+			'TICKET_SELECTOR_CAFF_TEMPLATES_PATH',
+			str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
+		);
+		add_action(
+			'AHEE__template_settings__template__before_settings_form',
+			array('EED_Ticket_Selector_Caff', 'template_settings_form')
+		);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page__update_template_settings__data',
+			array('EED_Ticket_Selector_Caff', 'update_template_settings'),
+			10,
+			2
+		);
+	}
 
 
-    /**
-     * @param WP $WP
-     */
-    public function run($WP)
-    {
-        $this->set_config();
-    }
+	/**
+	 * @param WP $WP
+	 */
+	public function run($WP)
+	{
+		$this->set_config();
+	}
 
 
-    /**
-     * @static
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function template_settings_form()
-    {
-        echo EED_Ticket_Selector_Caff::_ticket_selector_settings_form()->get_html();
-    }
+	/**
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function template_settings_form()
+	{
+		echo EED_Ticket_Selector_Caff::_ticket_selector_settings_form()->get_html();
+	}
 
 
-    /**
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function _ticket_selector_settings_form(): EE_Form_Section_Proper
-    {
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'ticket_selector_settings_form',
-                'html_id'         => 'ticket_selector_settings_form',
-                'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
-                    array(
-                        'appearance_settings_hdr' => new EE_Form_Section_HTML(
-                            EEH_HTML::br(2) .
-                            EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
-                        ),
-                        'appearance_settings'     => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings(),
-                    )
-                ),
-            )
-        );
-    }
+	/**
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function _ticket_selector_settings_form(): EE_Form_Section_Proper
+	{
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'ticket_selector_settings_form',
+				'html_id'         => 'ticket_selector_settings_form',
+				'layout_strategy' => new EE_Div_Per_Section_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
+					array(
+						'appearance_settings_hdr' => new EE_Form_Section_HTML(
+							EEH_HTML::br(2) .
+							EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
+						),
+						'appearance_settings'     => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings(),
+					)
+				),
+			)
+		);
+	}
 
 
-    /**
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function _ticket_selector_appearance_settings(): EE_Form_Section_Proper
-    {
-        if (
-            ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
-        ) {
-            EED_Ticket_Selector::instance()->set_config();
-            EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = EED_Ticket_Selector::instance()
-                                                                                                      ->config();
-        }
-        $EE_Ticket_Selector_Config = EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector;
-        // get option for whether to show datetime selector in TS
-        $show_datetime_selector = $EE_Ticket_Selector_Config->getShowDatetimeSelector();
-        // and option for how may datetimes must exist if display is conditional
-        $datetime_selector_threshold = $EE_Ticket_Selector_Config->getDatetimeSelectorThreshold();
+	/**
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function _ticket_selector_appearance_settings(): EE_Form_Section_Proper
+	{
+		if (
+			! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config
+		) {
+			EED_Ticket_Selector::instance()->set_config();
+			EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = EED_Ticket_Selector::instance()
+																									  ->config();
+		}
+		$EE_Ticket_Selector_Config = EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector;
+		// get option for whether to show datetime selector in TS
+		$show_datetime_selector = $EE_Ticket_Selector_Config->getShowDatetimeSelector();
+		// and option for how may datetimes must exist if display is conditional
+		$datetime_selector_threshold = $EE_Ticket_Selector_Config->getDatetimeSelectorThreshold();
 
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'ticket_selector_settings_tbl',
-                'html_id'         => 'ticket_selector_settings_tbl',
-                'html_class'      => 'form-table',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections',
-                    array(
-                        'show_ticket_details'         => new EE_Yes_No_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Ticket Details?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'This lets you choose whether the extra ticket details section is displayed with the ticket selector.',
-                                    'event_espresso'
-                                ),
-                                'default'                 => $EE_Ticket_Selector_Config->show_ticket_details ?? true,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'show_ticket_sale_columns'    => new EE_Yes_No_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Ticket Sale Info?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.',
-                                    'event_espresso'
-                                ),
-                                'default'                 => $EE_Ticket_Selector_Config->show_ticket_sale_columns ?? true,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'show_expired_tickets'        => new EE_Yes_No_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Expired Tickets?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'Indicate whether to show expired tickets in the ticket selector',
-                                    'event_espresso'
-                                ),
-                                'default'                 => $EE_Ticket_Selector_Config->show_expired_tickets ?? true,
-                                'display_html_label_text' => false,
-                            )
-                        ),
-                        'show_datetime_selector'      => new EE_Select_Input(
-                            $EE_Ticket_Selector_Config->getShowDatetimeSelectorOptions(false),
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Show Date & Time Filter?',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => sprintf(
-                                    esc_html__(
-                                        'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s   this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s   this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
-                                        'event_espresso'
-                                    ),
-                                    '<br>',
-                                    '<strong>',
-                                    '</strong>'
-                                ),
-                                'default'                 => ! empty($show_datetime_selector)
-                                    ? $show_datetime_selector
-                                    : EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
-                                'display_html_label_text' => false,
-                                'html_class'              => 'ee-input-width--reg',
-                            )
-                        ),
-                        'datetime_selector_threshold' => new EE_Select_Input(
-                            array_combine($r = range(1, 10), $r),
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Date & Time Filter Threshold',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => esc_html__(
-                                    'The number of unique dates an event has to have before conditionally displaying a date & time filter',
-                                    'event_espresso'
-                                ),
-                                'default'                 => ! empty($datetime_selector_threshold)
-                                    ? $datetime_selector_threshold
-                                    : 3,
-                                'display_html_label_text' => false,
-                                'html_class'              => 'ee-input-width--tiny',
-                            )
-                        ),
-                        'datetime_selector_max_checked' => new EE_Integer_Input(
-                            array(
-                                'html_label_text'         => esc_html__(
-                                    'Date & Time Filter Max Checked',
-                                    'event_espresso'
-                                ),
-                                'html_help_text'          => sprintf(
-                                    esc_html__(
-                                        'Determines the maximum number of dates that will be checked upon initial loading for a Date and Time Filter.%1$sIf set to zero or left blank, then ALL dates will be checked upon initial loading.',
-                                        'event_espresso'
-                                    ),
-                                    '<br>'
-                                ),
-                                'default'                 => $EE_Ticket_Selector_Config->getDatetimeSelectorMaxChecked(),
-                                'display_html_label_text' => false,
-                                'min_value'               => 0,
-                                'html_class'              => 'ee-input-width--tiny',
-                            )
-                        ),
-                    )
-                ),
-            )
-        );
-    }
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'ticket_selector_settings_tbl',
+				'html_id'         => 'ticket_selector_settings_tbl',
+				'html_class'      => 'form-table',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections',
+					array(
+						'show_ticket_details'         => new EE_Yes_No_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Ticket Details?',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'This lets you choose whether the extra ticket details section is displayed with the ticket selector.',
+									'event_espresso'
+								),
+								'default'                 => $EE_Ticket_Selector_Config->show_ticket_details ?? true,
+								'display_html_label_text' => false,
+							)
+						),
+						'show_ticket_sale_columns'    => new EE_Yes_No_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Ticket Sale Info?',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.',
+									'event_espresso'
+								),
+								'default'                 => $EE_Ticket_Selector_Config->show_ticket_sale_columns ?? true,
+								'display_html_label_text' => false,
+							)
+						),
+						'show_expired_tickets'        => new EE_Yes_No_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Expired Tickets?',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'Indicate whether to show expired tickets in the ticket selector',
+									'event_espresso'
+								),
+								'default'                 => $EE_Ticket_Selector_Config->show_expired_tickets ?? true,
+								'display_html_label_text' => false,
+							)
+						),
+						'show_datetime_selector'      => new EE_Select_Input(
+							$EE_Ticket_Selector_Config->getShowDatetimeSelectorOptions(false),
+							array(
+								'html_label_text'         => esc_html__(
+									'Show Date & Time Filter?',
+									'event_espresso'
+								),
+								'html_help_text'          => sprintf(
+									esc_html__(
+										'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s &bull; %2$sdo not show date & time filter%3$s%1$s &nbsp; this option will NEVER display a date filter, regardless of how many dates exist.%1$s &bull; %2$smaybe show date & time filter%3$s%1$s &nbsp; this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
+										'event_espresso'
+									),
+									'<br>',
+									'<strong>',
+									'</strong>'
+								),
+								'default'                 => ! empty($show_datetime_selector)
+									? $show_datetime_selector
+									: EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
+								'display_html_label_text' => false,
+								'html_class'              => 'ee-input-width--reg',
+							)
+						),
+						'datetime_selector_threshold' => new EE_Select_Input(
+							array_combine($r = range(1, 10), $r),
+							array(
+								'html_label_text'         => esc_html__(
+									'Date & Time Filter Threshold',
+									'event_espresso'
+								),
+								'html_help_text'          => esc_html__(
+									'The number of unique dates an event has to have before conditionally displaying a date & time filter',
+									'event_espresso'
+								),
+								'default'                 => ! empty($datetime_selector_threshold)
+									? $datetime_selector_threshold
+									: 3,
+								'display_html_label_text' => false,
+								'html_class'              => 'ee-input-width--tiny',
+							)
+						),
+						'datetime_selector_max_checked' => new EE_Integer_Input(
+							array(
+								'html_label_text'         => esc_html__(
+									'Date & Time Filter Max Checked',
+									'event_espresso'
+								),
+								'html_help_text'          => sprintf(
+									esc_html__(
+										'Determines the maximum number of dates that will be checked upon initial loading for a Date and Time Filter.%1$sIf set to zero or left blank, then ALL dates will be checked upon initial loading.',
+										'event_espresso'
+									),
+									'<br>'
+								),
+								'default'                 => $EE_Ticket_Selector_Config->getDatetimeSelectorMaxChecked(),
+								'display_html_label_text' => false,
+								'min_value'               => 0,
+								'html_class'              => 'ee-input-width--tiny',
+							)
+						),
+					)
+				),
+			)
+		);
+	}
 
 
-    /**
-     * callback for updating template settings
-     *
-     * @param EE_Template_Config $CFG
-     * @param array              $REQ incoming request
-     * @return EE_Template_Config
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     *@since 4.6.18.rc.006
-     */
-    public static function update_template_settings(EE_Template_Config $CFG, array $REQ): EE_Template_Config
-    {
-        /** @var EE_Capabilities $capabilities */
-        $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
-            wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
-        }
-        if (! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
-            EED_Ticket_Selector::instance()->set_config();
-            $CFG->EED_Ticket_Selector = EED_Ticket_Selector::instance()->config();
-        }
-        try {
-            $ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
+	/**
+	 * callback for updating template settings
+	 *
+	 * @param EE_Template_Config $CFG
+	 * @param array              $REQ incoming request
+	 * @return EE_Template_Config
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 *@since 4.6.18.rc.006
+	 */
+	public static function update_template_settings(EE_Template_Config $CFG, array $REQ): EE_Template_Config
+	{
+		/** @var EE_Capabilities $capabilities */
+		$capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
+		if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+			wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
+		}
+		if (! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
+			EED_Ticket_Selector::instance()->set_config();
+			$CFG->EED_Ticket_Selector = EED_Ticket_Selector::instance()->config();
+		}
+		try {
+			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
 
-            // check for form submission
-            if ($ticket_selector_form->was_submitted()) {
-                // capture form data
-                $ticket_selector_form->receive_form_submission();
+			// check for form submission
+			if ($ticket_selector_form->was_submitted()) {
+				// capture form data
+				$ticket_selector_form->receive_form_submission();
 
-                // validate form data
-                if ($ticket_selector_form->is_valid()) {
-                    // grab validated data from form
-                    $valid_data = $ticket_selector_form->valid_data();
+				// validate form data
+				if ($ticket_selector_form->is_valid()) {
+					// grab validated data from form
+					$valid_data = $ticket_selector_form->valid_data();
 
-                    // set data on config
-                    $CFG->EED_Ticket_Selector->show_ticket_sale_columns = $valid_data['appearance_settings']['show_ticket_sale_columns'];
-                    $CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
-                    $CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
-                    $CFG->EED_Ticket_Selector->setShowDatetimeSelector(
-                        $valid_data['appearance_settings']['show_datetime_selector']
-                    );
-                    $CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
-                        $valid_data['appearance_settings']['datetime_selector_threshold']
-                    );
-                    $CFG->EED_Ticket_Selector->setDatetimeSelectorMaxChecked(
-                        $valid_data['appearance_settings']['datetime_selector_max_checked']
-                    );
-                } else {
-                    if ($ticket_selector_form->submission_error_message() !== '') {
-                        EE_Error::add_error(
-                            $ticket_selector_form->submission_error_message(),
-                            __FILE__,
-                            __FUNCTION__,
-                            __LINE__
-                        );
-                    }
-                }
-            }
-        } catch (EE_Error $e) {
-            $e->get_error();
-        }
+					// set data on config
+					$CFG->EED_Ticket_Selector->show_ticket_sale_columns = $valid_data['appearance_settings']['show_ticket_sale_columns'];
+					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
+					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
+					$CFG->EED_Ticket_Selector->setShowDatetimeSelector(
+						$valid_data['appearance_settings']['show_datetime_selector']
+					);
+					$CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
+						$valid_data['appearance_settings']['datetime_selector_threshold']
+					);
+					$CFG->EED_Ticket_Selector->setDatetimeSelectorMaxChecked(
+						$valid_data['appearance_settings']['datetime_selector_max_checked']
+					);
+				} else {
+					if ($ticket_selector_form->submission_error_message() !== '') {
+						EE_Error::add_error(
+							$ticket_selector_form->submission_error_message(),
+							__FILE__,
+							__FUNCTION__,
+							__LINE__
+						);
+					}
+				}
+			}
+		} catch (EE_Error $e) {
+			$e->get_error();
+		}
 
-        return $CFG;
-    }
+		return $CFG;
+	}
 
 
-    /**
-     * @param EE_Ticket $ticket
-     * @param float     $ticket_price
-     * @param bool      $display_ticket_price
-     */
-    public static function ticket_price_details(EE_Ticket $ticket, float $ticket_price = 0, bool $display_ticket_price = false)
-    {
-        require str_replace('\\', '/', plugin_dir_path(__FILE__))
-                . 'templates/ticket_selector_price_details.template.php';
-    }
+	/**
+	 * @param EE_Ticket $ticket
+	 * @param float     $ticket_price
+	 * @param bool      $display_ticket_price
+	 */
+	public static function ticket_price_details(EE_Ticket $ticket, float $ticket_price = 0, bool $display_ticket_price = false)
+	{
+		require str_replace('\\', '/', plugin_dir_path(__FILE__))
+				. 'templates/ticket_selector_price_details.template.php';
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     {
         define(
             'TICKET_SELECTOR_CAFF_TEMPLATES_PATH',
-            str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/'
+            str_replace('\\', '/', plugin_dir_path(__FILE__)).'templates/'
         );
         add_action(
             'AHEE__template_settings__template__before_settings_form',
@@ -105,7 +105,7 @@ 
                     'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
                     array(
                         'appearance_settings_hdr' => new EE_Form_Section_HTML(
-                            EEH_HTML::br(2) .
+                            EEH_HTML::br(2).
                             EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
                         ),
                         'appearance_settings'     => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings(),
@@ -271,10 +271,10 @@ 
     {
         /** @var EE_Capabilities $capabilities */
         $capabilities = LoaderFactory::getLoader()->getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
+        if ( ! $capabilities->current_user_can('ee_edit_events', 'edit-event-template-settings')) {
             wp_die(esc_html__('You do not have the required privileges to perform this action', 'event_espresso'));
         }
-        if (! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
+        if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
             EED_Ticket_Selector::instance()->set_config();
             $CFG->EED_Ticket_Selector = EED_Ticket_Selector::instance()->config();
         }

PaymentMethods/PayPalCommerce/PayPalCheckout/EEG_PayPalCheckout.gateway.php

Indentation +224 added lines, -224 removed lines

@@ -13,238 +13,238 @@
  */
 class EEG_PayPalCheckout extends EE_Onsite_Gateway
 {
-    /**
-     * Currencies supported by this gateway.
-     *
-     * @var array
-     */
-    protected $_currencies_supported = [
-        'AUD',
-        'BRL',
-        'CAD',
-        'CNY',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MYR',
-        'MXN',
-        'TWD',
-        'NZD',
-        'NOK',
-        'PHP',
-        'PLN',
-        'GBP',
-        'RUB',
-        'SGD',
-        'SEK',
-        'CHF',
-        'THB',
-        'USD',
-    ];
+	/**
+	 * Currencies supported by this gateway.
+	 *
+	 * @var array
+	 */
+	protected $_currencies_supported = [
+		'AUD',
+		'BRL',
+		'CAD',
+		'CNY',
+		'CZK',
+		'DKK',
+		'EUR',
+		'HKD',
+		'HUF',
+		'ILS',
+		'JPY',
+		'MYR',
+		'MXN',
+		'TWD',
+		'NZD',
+		'NOK',
+		'PHP',
+		'PLN',
+		'GBP',
+		'RUB',
+		'SGD',
+		'SEK',
+		'CHF',
+		'THB',
+		'USD',
+	];
 
 
-    /**
-     * Override the parent.
-     *
-     * @param EE_Payment|null $payment
-     * @param array|null      $billing_info
-     * @return EE_Payment
-     */
-    public function do_direct_payment($payment, $billing_info = null)
-    {
-        // Normally we shouldn't be getting here because the payment should have been processed
-        // along with the PP Order Charge.
-        return $payment;
-    }
+	/**
+	 * Override the parent.
+	 *
+	 * @param EE_Payment|null $payment
+	 * @param array|null      $billing_info
+	 * @return EE_Payment
+	 */
+	public function do_direct_payment($payment, $billing_info = null)
+	{
+		// Normally we shouldn't be getting here because the payment should have been processed
+		// along with the PP Order Charge.
+		return $payment;
+	}
 
 
-    /**
-     * Validate the Order.
-     *
-     * @param      $order
-     * @param null $provided_order_id
-     * @return array ['completed' => {boolean}, 'message' => {string}]
-     */
-    public static function isOrderCompleted($order, $provided_order_id = null): array
-    {
-        $conclusion = [
-            'completed' => false,
-            'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
-        ];
-        if (! empty($order) && ! empty($provided_order_id) && $order['id'] !== $provided_order_id) {
-            $conclusion['message'] = esc_html__('Order ID mismatch.', 'event_espresso');
-        }
-        if (! $order || ! is_array($order)) {
-            $conclusion['message'] = esc_html__('The Order data is incorrectly formatted.', 'event_espresso');
-        } elseif (empty($order['status'])) {
-            $conclusion['message'] = esc_html__(
-                'There was an error with this payment. The status of the Order could not be determined.',
-                'event_espresso'
-            );
-        } elseif ($order['status'] !== 'COMPLETED') {
-            $conclusion['message'] = esc_html__(
-                'There was an error with this payment. Order was not approved.',
-                'event_espresso'
-            );
-        } elseif (empty($order['purchase_units'][0]['payments']['captures'][0]['status'])) {
-            $conclusion['message'] = esc_html__(
-                'There was an error with this payment. The status of the Payment could not be determined.',
-                'event_espresso'
-            );
-        } elseif ($order['purchase_units'][0]['payments']['captures'][0]['status'] !== 'COMPLETED') {
-            $conclusion['message'] = esc_html__(
-                'This payment was declined or failed validation. Please check the billing information you provided.',
-                'event_espresso'
-            );
-        } else {
-            // If we didn't fail on the above, the Order should be considered valid.
-            $conclusion['completed'] = true;
-        }
-        return $conclusion;
-    }
+	/**
+	 * Validate the Order.
+	 *
+	 * @param      $order
+	 * @param null $provided_order_id
+	 * @return array ['completed' => {boolean}, 'message' => {string}]
+	 */
+	public static function isOrderCompleted($order, $provided_order_id = null): array
+	{
+		$conclusion = [
+			'completed' => false,
+			'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
+		];
+		if (! empty($order) && ! empty($provided_order_id) && $order['id'] !== $provided_order_id) {
+			$conclusion['message'] = esc_html__('Order ID mismatch.', 'event_espresso');
+		}
+		if (! $order || ! is_array($order)) {
+			$conclusion['message'] = esc_html__('The Order data is incorrectly formatted.', 'event_espresso');
+		} elseif (empty($order['status'])) {
+			$conclusion['message'] = esc_html__(
+				'There was an error with this payment. The status of the Order could not be determined.',
+				'event_espresso'
+			);
+		} elseif ($order['status'] !== 'COMPLETED') {
+			$conclusion['message'] = esc_html__(
+				'There was an error with this payment. Order was not approved.',
+				'event_espresso'
+			);
+		} elseif (empty($order['purchase_units'][0]['payments']['captures'][0]['status'])) {
+			$conclusion['message'] = esc_html__(
+				'There was an error with this payment. The status of the Payment could not be determined.',
+				'event_espresso'
+			);
+		} elseif ($order['purchase_units'][0]['payments']['captures'][0]['status'] !== 'COMPLETED') {
+			$conclusion['message'] = esc_html__(
+				'This payment was declined or failed validation. Please check the billing information you provided.',
+				'event_espresso'
+			);
+		} else {
+			// If we didn't fail on the above, the Order should be considered valid.
+			$conclusion['completed'] = true;
+		}
+		return $conclusion;
+	}
 
 
-    /**
-     * Create an EE Payment.
-     *
-     * @param EE_Transaction    $transaction
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function createPayment(EE_Transaction $transaction, EE_Payment_Method $payment_method): EE_Payment
-    {
-        // No payment for this transaction was created at this point.
-        $payment = EE_Payment::new_instance([
-            'PAY_timestamp'     => time(),
-            'TXN_ID'            => $transaction->ID(),
-            'PMD_ID'            => $payment_method->ID(),
-            'PAY_po_number'     => null,
-            'PAY_extra_accntng' => null,
-            'PAY_details'       => null,
-        ]);
-        $payment->save();
-        return $payment;
-    }
+	/**
+	 * Create an EE Payment.
+	 *
+	 * @param EE_Transaction    $transaction
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function createPayment(EE_Transaction $transaction, EE_Payment_Method $payment_method): EE_Payment
+	{
+		// No payment for this transaction was created at this point.
+		$payment = EE_Payment::new_instance([
+			'PAY_timestamp'     => time(),
+			'TXN_ID'            => $transaction->ID(),
+			'PMD_ID'            => $payment_method->ID(),
+			'PAY_po_number'     => null,
+			'PAY_extra_accntng' => null,
+			'PAY_details'       => null,
+		]);
+		$payment->save();
+		return $payment;
+	}
 
 
-    /**
-     * Set a payment error and log the data.
-     *
-     * @param EE_Payment   $payment
-     * @param string       $status
-     * @param array|string $response_data
-     * @param string       $update_message
-     * @return EE_Payment
-     * @throws EE_Error|ReflectionException
-     */
-    public static function updatePaymentStatus(
-        EE_Payment $payment,
-        string     $status,
-                   $response_data,
-        string     $update_message = ''
-    ): EE_Payment {
-        $paypal_pm = ! empty($payment->payment_method())
-            ? EEM_Payment_Method::instance()->get_one_by_slug($payment->payment_method()->name())
-            : null;
-        // Is this a successful payment ?
-        if ($status === EEM_Payment::status_id_approved) {
-            $default_message = esc_html__('Successful payment.', 'event_espresso');
-            $amount          = $response_data['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0;
-            // Don't set the amount if there is no info on that with this order.
-            if (! empty($amount)) {
-                $payment->set_amount((float) $amount);
-            }
-            $payment->set_txn_id_chq_nmbr(
-                $order['purchase_units'][0]['payments']['captures'][0]['id'] ?? $response_data['id']
-            );
-        } else {
-            $default_message = sprintf(
-                esc_html__(
-                    'Your payment could not be processed successfully due to a technical issue.%1$sPlease try again or contact%2$s for assistance.',
-                    'event_espresso'
-                ),
-                '<br/>',
-                EE_Registry::instance()->CFG->organization->get_pretty('email')
-            );
-        }
-        $log_message = $update_message ?: $default_message;
-        PayPalLogger::errorLog($log_message, $response_data, $paypal_pm, false, $payment->transaction());
-        $payment->set_status($status);
-        $payment->set_details($log_message);
-        $payment->set_gateway_response($log_message);
-        $payment->save();
-        return $payment;
-    }
+	/**
+	 * Set a payment error and log the data.
+	 *
+	 * @param EE_Payment   $payment
+	 * @param string       $status
+	 * @param array|string $response_data
+	 * @param string       $update_message
+	 * @return EE_Payment
+	 * @throws EE_Error|ReflectionException
+	 */
+	public static function updatePaymentStatus(
+		EE_Payment $payment,
+		string     $status,
+				   $response_data,
+		string     $update_message = ''
+	): EE_Payment {
+		$paypal_pm = ! empty($payment->payment_method())
+			? EEM_Payment_Method::instance()->get_one_by_slug($payment->payment_method()->name())
+			: null;
+		// Is this a successful payment ?
+		if ($status === EEM_Payment::status_id_approved) {
+			$default_message = esc_html__('Successful payment.', 'event_espresso');
+			$amount          = $response_data['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0;
+			// Don't set the amount if there is no info on that with this order.
+			if (! empty($amount)) {
+				$payment->set_amount((float) $amount);
+			}
+			$payment->set_txn_id_chq_nmbr(
+				$order['purchase_units'][0]['payments']['captures'][0]['id'] ?? $response_data['id']
+			);
+		} else {
+			$default_message = sprintf(
+				esc_html__(
+					'Your payment could not be processed successfully due to a technical issue.%1$sPlease try again or contact%2$s for assistance.',
+					'event_espresso'
+				),
+				'<br/>',
+				EE_Registry::instance()->CFG->organization->get_pretty('email')
+			);
+		}
+		$log_message = $update_message ?: $default_message;
+		PayPalLogger::errorLog($log_message, $response_data, $paypal_pm, false, $payment->transaction());
+		$payment->set_status($status);
+		$payment->set_details($log_message);
+		$payment->set_gateway_response($log_message);
+		$payment->save();
+		return $payment;
+	}
 
 
-    /**
-     * Save some transaction details, like billing information.
-     *
-     * @param EE_Payment     $payment
-     * @param EE_Transaction $transaction
-     * @param array          $order
-     * @param array          $billing_info
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function saveBillingDetails(
-        EE_Payment     $payment,
-        EE_Transaction $transaction,
-        array          $order,
-        array          $billing_info
-    ): void {
-        $primary_reg    = $transaction->primary_registration();
-        $attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
-        $payment_method = $transaction->payment_method();
-        $postmeta_name  = $payment_method->type_obj() instanceof EE_PMT_Base
-            ? 'billing_info_' . $payment_method->type_obj()->system_name()
-            : '';
-        if (empty($order['payment_source']) || ! $attendee instanceof EE_Attendee) {
-            // I guess we are done here then. Just save what we have.
-            $payment->set_details($order);
-            return;
-        }
-        // Do we have order information from the express checkout (PayPal button) ?
-        $billing_info['first_name'] = $billing_info['first_name'] ?? $attendee->fname();
-        $billing_info['last_name']  = $billing_info['last_name'] ?? $attendee->lname();
-        $billing_info['email']      = $billing_info['email'] ?? $attendee->email();
-        if (! empty($billing_info['address'])) {
-            $attendee->set_address($billing_info['address']);
-        }
-        if (! empty($billing_info['address_2'])) {
-            $attendee->set_address2($billing_info['address_2']);
-        }
-        if (! empty($billing_info['city'])) {
-            $attendee->set_city($billing_info['city']);
-        }
-        if (! empty($billing_info['state_id'])) {
-            $attendee->set_state((int) $billing_info['state_id']);
-        }
-        if (! empty($billing_info['country'])) {
-            $attendee->set_country($billing_info['country']);
-        }
-        if (! empty($billing_info['zip'])) {
-            $attendee->set_zip($billing_info['zip']);
-        }
-        // Or card information from ACDC ?
-        if (! empty($order['payment_source']['card'])) {
-            $payer_card = $order['payment_source']['card'];
-            if (! empty($payer_card['name'])) {
-                $full_name = explode(' ', $payer_card['name']);
-                // Don't need to save each field because others should be populated from the billing form.
-                $billing_info['credit_card'] = $payer_card['last_digits'] ?? '';
-                $billing_info['first_name']  = $full_name[0] ?? $attendee->fname();
-                $billing_info['last_name']   = $full_name[1] ?? $attendee->lname();
-            }
-        }
-        update_post_meta($attendee->ID(), $postmeta_name, $billing_info);
-        $attendee->save();
-    }
+	/**
+	 * Save some transaction details, like billing information.
+	 *
+	 * @param EE_Payment     $payment
+	 * @param EE_Transaction $transaction
+	 * @param array          $order
+	 * @param array          $billing_info
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function saveBillingDetails(
+		EE_Payment     $payment,
+		EE_Transaction $transaction,
+		array          $order,
+		array          $billing_info
+	): void {
+		$primary_reg    = $transaction->primary_registration();
+		$attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
+		$payment_method = $transaction->payment_method();
+		$postmeta_name  = $payment_method->type_obj() instanceof EE_PMT_Base
+			? 'billing_info_' . $payment_method->type_obj()->system_name()
+			: '';
+		if (empty($order['payment_source']) || ! $attendee instanceof EE_Attendee) {
+			// I guess we are done here then. Just save what we have.
+			$payment->set_details($order);
+			return;
+		}
+		// Do we have order information from the express checkout (PayPal button) ?
+		$billing_info['first_name'] = $billing_info['first_name'] ?? $attendee->fname();
+		$billing_info['last_name']  = $billing_info['last_name'] ?? $attendee->lname();
+		$billing_info['email']      = $billing_info['email'] ?? $attendee->email();
+		if (! empty($billing_info['address'])) {
+			$attendee->set_address($billing_info['address']);
+		}
+		if (! empty($billing_info['address_2'])) {
+			$attendee->set_address2($billing_info['address_2']);
+		}
+		if (! empty($billing_info['city'])) {
+			$attendee->set_city($billing_info['city']);
+		}
+		if (! empty($billing_info['state_id'])) {
+			$attendee->set_state((int) $billing_info['state_id']);
+		}
+		if (! empty($billing_info['country'])) {
+			$attendee->set_country($billing_info['country']);
+		}
+		if (! empty($billing_info['zip'])) {
+			$attendee->set_zip($billing_info['zip']);
+		}
+		// Or card information from ACDC ?
+		if (! empty($order['payment_source']['card'])) {
+			$payer_card = $order['payment_source']['card'];
+			if (! empty($payer_card['name'])) {
+				$full_name = explode(' ', $payer_card['name']);
+				// Don't need to save each field because others should be populated from the billing form.
+				$billing_info['credit_card'] = $payer_card['last_digits'] ?? '';
+				$billing_info['first_name']  = $full_name[0] ?? $attendee->fname();
+				$billing_info['last_name']   = $full_name[1] ?? $attendee->lname();
+			}
+		}
+		update_post_meta($attendee->ID(), $postmeta_name, $billing_info);
+		$attendee->save();
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -75,10 +75,10 @@ 
             'completed' => false,
             'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
         ];
-        if (! empty($order) && ! empty($provided_order_id) && $order['id'] !== $provided_order_id) {
+        if ( ! empty($order) && ! empty($provided_order_id) && $order['id'] !== $provided_order_id) {
             $conclusion['message'] = esc_html__('Order ID mismatch.', 'event_espresso');
         }
-        if (! $order || ! is_array($order)) {
+        if ( ! $order || ! is_array($order)) {
             $conclusion['message'] = esc_html__('The Order data is incorrectly formatted.', 'event_espresso');
         } elseif (empty($order['status'])) {
             $conclusion['message'] = esc_html__(
@@ -157,7 +157,7 @@ 
             $default_message = esc_html__('Successful payment.', 'event_espresso');
             $amount          = $response_data['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0;
             // Don't set the amount if there is no info on that with this order.
-            if (! empty($amount)) {
+            if ( ! empty($amount)) {
                 $payment->set_amount((float) $amount);
             }
             $payment->set_txn_id_chq_nmbr(
@@ -204,7 +204,7 @@ 
         $attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
         $payment_method = $transaction->payment_method();
         $postmeta_name  = $payment_method->type_obj() instanceof EE_PMT_Base
-            ? 'billing_info_' . $payment_method->type_obj()->system_name()
+            ? 'billing_info_'.$payment_method->type_obj()->system_name()
             : '';
         if (empty($order['payment_source']) || ! $attendee instanceof EE_Attendee) {
             // I guess we are done here then. Just save what we have.
@@ -215,28 +215,28 @@ 
         $billing_info['first_name'] = $billing_info['first_name'] ?? $attendee->fname();
         $billing_info['last_name']  = $billing_info['last_name'] ?? $attendee->lname();
         $billing_info['email']      = $billing_info['email'] ?? $attendee->email();
-        if (! empty($billing_info['address'])) {
+        if ( ! empty($billing_info['address'])) {
             $attendee->set_address($billing_info['address']);
         }
-        if (! empty($billing_info['address_2'])) {
+        if ( ! empty($billing_info['address_2'])) {
             $attendee->set_address2($billing_info['address_2']);
         }
-        if (! empty($billing_info['city'])) {
+        if ( ! empty($billing_info['city'])) {
             $attendee->set_city($billing_info['city']);
         }
-        if (! empty($billing_info['state_id'])) {
+        if ( ! empty($billing_info['state_id'])) {
             $attendee->set_state((int) $billing_info['state_id']);
         }
-        if (! empty($billing_info['country'])) {
+        if ( ! empty($billing_info['country'])) {
             $attendee->set_country($billing_info['country']);
         }
-        if (! empty($billing_info['zip'])) {
+        if ( ! empty($billing_info['zip'])) {
             $attendee->set_zip($billing_info['zip']);
         }
         // Or card information from ACDC ?
-        if (! empty($order['payment_source']['card'])) {
+        if ( ! empty($order['payment_source']['card'])) {
             $payer_card = $order['payment_source']['card'];
-            if (! empty($payer_card['name'])) {
+            if ( ! empty($payer_card['name'])) {
                 $full_name = explode(' ', $payer_card['name']);
                 // Don't need to save each field because others should be populated from the billing form.
                 $billing_info['credit_card'] = $payer_card['last_digits'] ?? '';

PaymentMethods/PayPalCommerce/PayPalCheckout/EE_PMT_PayPalCheckout.pm.php

Indentation +169 added lines, -169 removed lines

@@ -16,186 +16,186 @@
  */
 class EE_PMT_PayPalCheckout extends EE_PMT_Base
 {
-    /**
-     * @param EE_Payment_Method|null $pm_instance
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_template_path       = dirname(__FILE__) . DS . 'templates' . DS;
-        $this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
-        $this->_default_button_url  = $this->file_url() . 'lib/default-cc-logo.png';
-        $this->_pretty_name         = esc_html__('PayPal Commerce', 'event_espresso');
-        $this->_cache_billing_form  = true;
-        $this->_requires_https      = true;
+	/**
+	 * @param EE_Payment_Method|null $pm_instance
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_template_path       = dirname(__FILE__) . DS . 'templates' . DS;
+		$this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
+		$this->_default_button_url  = $this->file_url() . 'lib/default-cc-logo.png';
+		$this->_pretty_name         = esc_html__('PayPal Commerce', 'event_espresso');
+		$this->_cache_billing_form  = true;
+		$this->_requires_https      = true;
 
-        // Load gateway.
-        require_once(
-            EEP_PAYPAL_COMMERCE_PATH . 'EEG_PayPalCheckout.gateway.php'
-        );
-        $this->_gateway = new EEG_PayPalCheckout();
+		// Load gateway.
+		require_once(
+			EEP_PAYPAL_COMMERCE_PATH . 'EEG_PayPalCheckout.gateway.php'
+		);
+		$this->_gateway = new EEG_PayPalCheckout();
 
-        // Display a refund message at transactions actions area.
-        add_action(
-            'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
-            [__CLASS__, 'refundNotice']
-        );
+		// Display a refund message at transactions actions area.
+		add_action(
+			'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
+			[__CLASS__, 'refundNotice']
+		);
 
-        parent::__construct($pm_instance);
-    }
+		parent::__construct($pm_instance);
+	}
 
 
-    /**
-     * Generate a new payment method settings form.
-     *
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_new_settings_form()
-    {
-        // Settings form.
-        $settings_form = new SettingsForm($this, $this->_pm_instance);
-        // Filter the form contents.
-        return apply_filters(
-            'FHEE__EE_PMT_PayPalCheckout__generate_new_settings_form__form_filtering',
-            $settings_form,
-            $this,
-            $this->_pm_instance
-        );
-    }
+	/**
+	 * Generate a new payment method settings form.
+	 *
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_new_settings_form()
+	{
+		// Settings form.
+		$settings_form = new SettingsForm($this, $this->_pm_instance);
+		// Filter the form contents.
+		return apply_filters(
+			'FHEE__EE_PMT_PayPalCheckout__generate_new_settings_form__form_filtering',
+			$settings_form,
+			$this,
+			$this->_pm_instance
+		);
+	}
 
 
-    /**
-     * Creates a billing form for this payment method type.
-     *
-     * @param EE_Transaction|null $transaction
-     * @param array|null          $extra_args
-     * @return EE_Billing_Info_Form|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null, ?array $extra_args = [])
-    {
-        $request        = LoaderFactory::getShared(Request::class);
-        $request_params = $request->requestParams();
-        // Return the default billing form for the postbox if this is a WP admin transaction info page.
-        if (! empty($request_params['page']) && $request_params['page'] === 'espresso_transactions') {
-            $default_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, $extra_args);
-            $default_form->add_subsections(['credit_card' => new EE_Credit_Card_Input()]);
-            return $default_form;
-        }
-        // Just in case this is used on other admin pages.
-        if (empty($transaction) && ! empty($request_params['TXN_ID'])) {
-            $txn_instance = EEM_Transaction::instance()->get_one_by_ID($request_params['TXN_ID']);
-            $transaction  = $txn_instance instanceof EE_Transaction ? $txn_instance : null;
-        }
-        $options = array_merge(
-            [
-                'transaction'   => $transaction,
-                'template_path' => $this->_template_path,
-            ],
-            $extra_args
-        );
-        return LoaderFactory::getNew(BillingForm::class, [$this->_pm_instance, $options]);
-    }
+	/**
+	 * Creates a billing form for this payment method type.
+	 *
+	 * @param EE_Transaction|null $transaction
+	 * @param array|null          $extra_args
+	 * @return EE_Billing_Info_Form|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null, ?array $extra_args = [])
+	{
+		$request        = LoaderFactory::getShared(Request::class);
+		$request_params = $request->requestParams();
+		// Return the default billing form for the postbox if this is a WP admin transaction info page.
+		if (! empty($request_params['page']) && $request_params['page'] === 'espresso_transactions') {
+			$default_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, $extra_args);
+			$default_form->add_subsections(['credit_card' => new EE_Credit_Card_Input()]);
+			return $default_form;
+		}
+		// Just in case this is used on other admin pages.
+		if (empty($transaction) && ! empty($request_params['TXN_ID'])) {
+			$txn_instance = EEM_Transaction::instance()->get_one_by_ID($request_params['TXN_ID']);
+			$transaction  = $txn_instance instanceof EE_Transaction ? $txn_instance : null;
+		}
+		$options = array_merge(
+			[
+				'transaction'   => $transaction,
+				'template_path' => $this->_template_path,
+			],
+			$extra_args
+		);
+		return LoaderFactory::getNew(BillingForm::class, [$this->_pm_instance, $options]);
+	}
 
 
-    /**
-     * Adds PM info to the help tab.
-     *
-     * @return array
-     * @see EE_PMT_Base::help_tabs_config()
-     */
-    public function help_tabs_config(): array
-    {
-        return [
-            $this->get_help_tab_name() => [
-                'title'    => esc_html__('PayPal Commerce settings', 'event_espresso'),
-                'filename' => 'pp-commerce-overview',
-            ],
-        ];
-    }
+	/**
+	 * Adds PM info to the help tab.
+	 *
+	 * @return array
+	 * @see EE_PMT_Base::help_tabs_config()
+	 */
+	public function help_tabs_config(): array
+	{
+		return [
+			$this->get_help_tab_name() => [
+				'title'    => esc_html__('PayPal Commerce settings', 'event_espresso'),
+				'filename' => 'pp-commerce-overview',
+			],
+		];
+	}
 
 
-    /**
-     * Adds a refund related message section.
-     *
-     * @param bool $can_edit_payments Flag that tells if user can edit payments.
-     * @access public
-     * @return void
-     */
-    public static function refundNotice(bool $can_edit_payments)
-    {
-        if (! $can_edit_payments) {
-            return;
-        }
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $txn_id  = $request->getRequestParam('TXN_ID', 0, DataType::INT);
-        try {
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
-            if (! $transaction instanceof EE_Transaction) {
-                return;
-            }
-            // Was this transaction paid using PayPal ?
-            if (strpos((string) $transaction->payment_method(), 'PayPal Commerce') === false) {
-                return;
-            }
-            // Try loading the template.
-            EE_Registry::instance()->load_helper('Template');
-        } catch (EE_Error|ReflectionException $e) {
-            // Just return, adding nothing.
-            return;
-        }
-        $html = EEH_Template::locate_template(
-            apply_filters(
-                'FHEEA__EE_PMT_PayPalCheckout__refundNotice',
-                dirname(__FILE__) . DS . 'templates' . DS . 'apply-refund-notice.template.php'
-            )
-        );
-        echo $html;
-    }
+	/**
+	 * Adds a refund related message section.
+	 *
+	 * @param bool $can_edit_payments Flag that tells if user can edit payments.
+	 * @access public
+	 * @return void
+	 */
+	public static function refundNotice(bool $can_edit_payments)
+	{
+		if (! $can_edit_payments) {
+			return;
+		}
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$txn_id  = $request->getRequestParam('TXN_ID', 0, DataType::INT);
+		try {
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
+			if (! $transaction instanceof EE_Transaction) {
+				return;
+			}
+			// Was this transaction paid using PayPal ?
+			if (strpos((string) $transaction->payment_method(), 'PayPal Commerce') === false) {
+				return;
+			}
+			// Try loading the template.
+			EE_Registry::instance()->load_helper('Template');
+		} catch (EE_Error|ReflectionException $e) {
+			// Just return, adding nothing.
+			return;
+		}
+		$html = EEH_Template::locate_template(
+			apply_filters(
+				'FHEEA__EE_PMT_PayPalCheckout__refundNotice',
+				dirname(__FILE__) . DS . 'templates' . DS . 'apply-refund-notice.template.php'
+			)
+		);
+		echo $html;
+	}
 
 
-    /**
-     * Override the parent.
-     *
-     * @param EE_Transaction            $transaction
-     * @param float|null                $amount
-     * @param EE_Billing_Info_Form|null $billing_info
-     * @param string|null               $return_url
-     * @param string                    $fail_url
-     * @param string                    $method
-     * @param bool                      $by_admin
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function process_payment(
-        EE_Transaction $transaction,
-                       $amount = null,
-                       $billing_info = null,
-                       $return_url = null,
-                       $fail_url = '',
-                       $method = 'CART',
-                       $by_admin = false
-    ): EE_Payment {
-        // This payment should have been processed in the background, while the Order was created and charged.
-        // So simply return the last payment. Unless it's somehow missing.
-        $payment = $transaction->last_payment();
-        if (empty($payment) || $payment->status() === EEM_Payment::status_id_failed) {
-            // Then we try processing the payment as usual.
-            return parent::process_payment(
-                $transaction,
-                $amount,
-                $billing_info,
-                $return_url,
-                $fail_url,
-                $method,
-                $by_admin
-            );
-        }
-        return $transaction->last_payment();
-    }
+	/**
+	 * Override the parent.
+	 *
+	 * @param EE_Transaction            $transaction
+	 * @param float|null                $amount
+	 * @param EE_Billing_Info_Form|null $billing_info
+	 * @param string|null               $return_url
+	 * @param string                    $fail_url
+	 * @param string                    $method
+	 * @param bool                      $by_admin
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function process_payment(
+		EE_Transaction $transaction,
+					   $amount = null,
+					   $billing_info = null,
+					   $return_url = null,
+					   $fail_url = '',
+					   $method = 'CART',
+					   $by_admin = false
+	): EE_Payment {
+		// This payment should have been processed in the background, while the Order was created and charged.
+		// So simply return the last payment. Unless it's somehow missing.
+		$payment = $transaction->last_payment();
+		if (empty($payment) || $payment->status() === EEM_Payment::status_id_failed) {
+			// Then we try processing the payment as usual.
+			return parent::process_payment(
+				$transaction,
+				$amount,
+				$billing_info,
+				$return_url,
+				$fail_url,
+				$method,
+				$by_admin
+			);
+		}
+		return $transaction->last_payment();
+	}
 }

PaymentMethods/PayPalCommerce/PayPalCommerce.php

Indentation +64 added lines, -64 removed lines

@@ -21,75 +21,75 @@
  */
 class PayPalCommerce
 {
-    public function __construct()
-    {
-    }
+	public function __construct()
+	{
+	}
 
 
-    /**
-     * Register with EE and load this payment method dependencies.
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public function initialize()
-    {
-        $this->registerDependencies();
-        // Register payment method through a legacy manager.
-        add_filter(
-            'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register',
-            [__CLASS__, 'injectPaymentMethod']
-        );
-        // Load modules.
-        /** @var LegacyModulesManager $legacy_modules_manager */
-        $legacy_modules_manager = LoaderFactory::getShared(LegacyModulesManager::class);
-        $legacy_modules_manager->registerModule(__DIR__ . '/modules/EED_PayPalCommerce.module.php');
-        $legacy_modules_manager->registerModule(__DIR__ . '/modules/EED_PayPalOnboard.module.php');
+	/**
+	 * Register with EE and load this payment method dependencies.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function initialize()
+	{
+		$this->registerDependencies();
+		// Register payment method through a legacy manager.
+		add_filter(
+			'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register',
+			[__CLASS__, 'injectPaymentMethod']
+		);
+		// Load modules.
+		/** @var LegacyModulesManager $legacy_modules_manager */
+		$legacy_modules_manager = LoaderFactory::getShared(LegacyModulesManager::class);
+		$legacy_modules_manager->registerModule(__DIR__ . '/modules/EED_PayPalCommerce.module.php');
+		$legacy_modules_manager->registerModule(__DIR__ . '/modules/EED_PayPalOnboard.module.php');
 
-        // Setup auto loaders.
-        EEH_Autoloader::instance()->register_autoloader([
-            'SettingsForm'   => EEP_PAYPAL_COMMERCE_PATH . 'forms/SettingsForm.php',
-            'OnboardingForm' => EEP_PAYPAL_COMMERCE_PATH . 'forms/OnboardingForm.php',
-            'BillingForm'    => EEP_PAYPAL_COMMERCE_PATH . 'forms/BillingForm.php',
-        ]);
-    }
+		// Setup auto loaders.
+		EEH_Autoloader::instance()->register_autoloader([
+			'SettingsForm'   => EEP_PAYPAL_COMMERCE_PATH . 'forms/SettingsForm.php',
+			'OnboardingForm' => EEP_PAYPAL_COMMERCE_PATH . 'forms/OnboardingForm.php',
+			'BillingForm'    => EEP_PAYPAL_COMMERCE_PATH . 'forms/BillingForm.php',
+		]);
+	}
 
 
-    /**
-     * Add this payment to the list of PMs to be registered.
-     *
-     * @param array $pms_to_register
-     * @return array
-     */
-    public static function injectPaymentMethod(array $pms_to_register): array
-    {
-        $pms_to_register[] = EEP_PAYPAL_COMMERCE_PATH;
-        return $pms_to_register;
-    }
+	/**
+	 * Add this payment to the list of PMs to be registered.
+	 *
+	 * @param array $pms_to_register
+	 * @return array
+	 */
+	public static function injectPaymentMethod(array $pms_to_register): array
+	{
+		$pms_to_register[] = EEP_PAYPAL_COMMERCE_PATH;
+		return $pms_to_register;
+	}
 
 
-    /**
-     * Register class dependencies.
-     *
-     * @return void
-     * @since 5.0.22.p
-     */
-    protected function registerDependencies(): void
-    {
-        EE_Dependency_Map::instance()->registerDependencies(
-            'EventEspresso\PaymentMethods\PayPalCommerce\api\orders\CreateOrder',
-            [
-                null,
-                null,
-                null,
-                'EventEspresso\core\domain\services\capabilities\FeatureFlags' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        EE_Dependency_Map::instance()->registerDependencies(
-            'EventEspresso\PaymentMethods\PayPalCommerce\tools\fees\PartnerPaymentFees',
-            [
-                'EventEspresso\core\services\payments\PaymentProcessorFees' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * Register class dependencies.
+	 *
+	 * @return void
+	 * @since 5.0.22.p
+	 */
+	protected function registerDependencies(): void
+	{
+		EE_Dependency_Map::instance()->registerDependencies(
+			'EventEspresso\PaymentMethods\PayPalCommerce\api\orders\CreateOrder',
+			[
+				null,
+				null,
+				null,
+				'EventEspresso\core\domain\services\capabilities\FeatureFlags' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		EE_Dependency_Map::instance()->registerDependencies(
+			'EventEspresso\PaymentMethods\PayPalCommerce\tools\fees\PartnerPaymentFees',
+			[
+				'EventEspresso\core\services\payments\PaymentProcessorFees' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -8,8 +8,8 @@ 
 use EventEspresso\core\services\loaders\LoaderFactory;
 use EventEspresso\core\services\modules\LegacyModulesManager;
 
-define('EEP_PAYPAL_COMMERCE_DIR', __DIR__ . DS);
-define('EEP_PAYPAL_COMMERCE_PATH', __DIR__ . DS . 'PayPalCheckout' . DS);
+define('EEP_PAYPAL_COMMERCE_DIR', __DIR__.DS);
+define('EEP_PAYPAL_COMMERCE_PATH', __DIR__.DS.'PayPalCheckout'.DS);
 define('EEP_PAYPAL_COMMERCE_URL', plugin_dir_url(__FILE__));
 
 /**
@@ -43,14 +43,14 @@ 
         // Load modules.
         /** @var LegacyModulesManager $legacy_modules_manager */
         $legacy_modules_manager = LoaderFactory::getShared(LegacyModulesManager::class);
-        $legacy_modules_manager->registerModule(__DIR__ . '/modules/EED_PayPalCommerce.module.php');
-        $legacy_modules_manager->registerModule(__DIR__ . '/modules/EED_PayPalOnboard.module.php');
+        $legacy_modules_manager->registerModule(__DIR__.'/modules/EED_PayPalCommerce.module.php');
+        $legacy_modules_manager->registerModule(__DIR__.'/modules/EED_PayPalOnboard.module.php');
 
         // Setup auto loaders.
         EEH_Autoloader::instance()->register_autoloader([
-            'SettingsForm'   => EEP_PAYPAL_COMMERCE_PATH . 'forms/SettingsForm.php',
-            'OnboardingForm' => EEP_PAYPAL_COMMERCE_PATH . 'forms/OnboardingForm.php',
-            'BillingForm'    => EEP_PAYPAL_COMMERCE_PATH . 'forms/BillingForm.php',
+            'SettingsForm'   => EEP_PAYPAL_COMMERCE_PATH.'forms/SettingsForm.php',
+            'OnboardingForm' => EEP_PAYPAL_COMMERCE_PATH.'forms/OnboardingForm.php',
+            'BillingForm'    => EEP_PAYPAL_COMMERCE_PATH.'forms/BillingForm.php',
         ]);
     }
 

PaymentMethods/PayPalCommerce/domain/Domain.php

Indentation +172 added lines, -172 removed lines

@@ -17,176 +17,176 @@
  */
 class Domain
 {
-    /**
-     * Name of the extra meta key that stores this PM options as one meta.
-     */
-    public const META_KEY_PAYPAL_DATA = 'paypal_data';
-    /**
-     * Name of the extra meta key that stores this PM options as one meta.
-     */
-    public const META_KEY_PAYPAL_DATA_SANDBOX = 'paypal_data_sandbox';
-
-    /**
-     * Name of the extra meta that stores whether the credentials were for the sandbox or live mode.
-     */
-    public const META_KEY_SANDBOX_MODE = 'sandbox_mode';
-
-    /**
-     * Name of the extra meta that stores the Access Token that is used to auth in API requests to PayPal.
-     */
-    public const META_KEY_ACCESS_TOKEN = 'access_token';
-
-    /**
-     * Name of the extra meta that stores the last request tracking ID.
-     */
-    public const META_KEY_TRACKING_ID = 'tracking_id';
-
-    /**
-     * Name of the extra meta that stores the Event Espresso PayPal Account's merchant id.
-     */
-    public const META_KEY_APP_ID = 'app_id';
-
-    /**
-     * Name of the extra meta that holds the seller client ID.
-     */
-    public const META_KEY_CLIENT_ID = 'client_id';
-
-    /**
-     * Name of the extra meta that holds the seller secret.
-     */
-    public const META_KEY_CLIENT_SECRET = 'client_secret';
-
-    /**
-     * Name of the extra meta that stores the expiration date of the Access Token.
-     */
-    public const META_KEY_TOKEN_EXPIRES_IN = 'expires_in';
-
-    /**
-     * Name of the extra meta that holds the partner client ID.
-     */
-    public const META_KEY_PARTNER_CLIENT_ID = 'partner_client_id';
-
-    /**
-     * Name of the extra meta that holds the partner merchant ID.
-     */
-    public const META_KEY_PARTNER_MERCHANT_ID = 'partner_merchant_id';
-
-    /**
-     * Name of the extra meta that holds the seller merchant ID.
-     */
-    public const META_KEY_SELLER_MERCHANT_ID = 'merchantIdInPayPal';
-
-    /**
-     * Name of the extra meta that holds the BN / request tracking code.
-     */
-    public const META_KEY_BN_CODE = 'bn_code';
-
-    /**
-     * Name of the extra meta that holds the last order details.
-     */
-    public const META_KEY_LAST_ORDER = 'last_order_details';
-
-    /**
-     * Name of the extra meta that holds the list of in progress orders.
-     */
-    public const META_KEY_PAYPAL_ORDERS = 'paypal_orders_list';
-
-    /**
-     * Name of the extra meta that stores the allowed PP checkout type selected by merchant while onboarding.
-     */
-    public const META_KEY_ALLOWED_CHECKOUT_TYPE = 'allowed_checkout_type';
-
-    /**
-     * Name of the extra meta that stores the merchant authorized scopes for our app to work within.
-     */
-    public const META_KEY_AUTHORIZED_SCOPES = 'authorized_scopes';
-
-    /**
-     * Name of the extra meta that stores the PP checkout type selected by merchant after onboarding.
-     */
-    public const META_KEY_CHECKOUT_TYPE = 'checkout_type';
-
-    /**
-     * Name of the PayPal API parameter that holds the auth code.
-     */
-    public const API_KEY_AUTH_CODE = 'authCode';
-
-    /**
-     * Name of the PayPal API parameter that holds the client token.
-     */
-    public const API_KEY_CLIENT_TOKEN = 'client_token';
-
-     /**
-     * Name of the extra meta that holds the seller payer ID.
-     */
-    public const META_KEY_PAYER_ID = 'payer_id';
-
-    /**
-     * Name of the PayPal API parameter that holds the client token expiration time.
-     */
-    public const API_KEY_EXPIRES_IN = 'expires_in';
-
-    /**
-     * Name of the PayPal API parameter that holds the list of oAuth integrations related to the merchant.
-     */
-    public const API_PARAM_OAUTH_INTEGRATIONS = 'oauth_integrations';
-
-    /**
-     * Name of the PayPal API parameter that holds the list of third party permissions that were granted.
-     */
-    public const API_PARAM_PERMISSIONS_GRANTED = 'oauth_third_party';
-
-    /**
-     * Name of the PayPal API parameter that holds the bool of if the primary email was confirmed.
-     */
-    public const API_PARAM_PRIM_EMAIL_CONFIRMED = 'primary_email_confirmed';
-
-    /**
-     * Name of the PayPal API parameter that holds the bool of if email was confirmed.
-     */
-    public const API_PARAM_EMAIL_CONFIRMED = 'isEmailConfirmed';
-
-    /**
-     * Name of the PayPal API parameter that holds the partner ID.
-     */
-    public const API_PARAM_PARTNER_ID = 'merchantId';
-
-    /**
-     * Name of the PayPal API parameter that holds the merchant ID in the Track seller onboarding status request.
-     */
-    public const API_PARAM_TRACK_MERCHANT_ID = 'merchant_id';
-
-    /**
-     * Name of the PayPal API parameter that holds the payments_receivable status.
-     */
-    public const API_PARAM_PAYMENTS_RECEIVABLE = 'payments_receivable';
-
-    /**
-     * Name of the nonce used in the capture order request.
-     */
-    public const CAPTURE_ORDER_NONCE_NAME = 'eea_pp_commerce_capture_order_payment';
-
-    /**
-     * Name of the nonce used in the onboarding process.
-     */
-    public const NONCE_NAME_ONBOARDING_RETURN = 'eea_pp_commerce_onboarding_return';
-
-    /**
-     * Holds this payment method slug.
-     */
-    public const PM_SLUG = 'paypalcheckout';
-
-
-    /**
-     * Returns the base PayPal API URL.
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getPayPalApiUrl(EE_Payment_Method $payment_method): string
-    {
-        return $payment_method->debug_mode() ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com';
-    }
+	/**
+	 * Name of the extra meta key that stores this PM options as one meta.
+	 */
+	public const META_KEY_PAYPAL_DATA = 'paypal_data';
+	/**
+	 * Name of the extra meta key that stores this PM options as one meta.
+	 */
+	public const META_KEY_PAYPAL_DATA_SANDBOX = 'paypal_data_sandbox';
+
+	/**
+	 * Name of the extra meta that stores whether the credentials were for the sandbox or live mode.
+	 */
+	public const META_KEY_SANDBOX_MODE = 'sandbox_mode';
+
+	/**
+	 * Name of the extra meta that stores the Access Token that is used to auth in API requests to PayPal.
+	 */
+	public const META_KEY_ACCESS_TOKEN = 'access_token';
+
+	/**
+	 * Name of the extra meta that stores the last request tracking ID.
+	 */
+	public const META_KEY_TRACKING_ID = 'tracking_id';
+
+	/**
+	 * Name of the extra meta that stores the Event Espresso PayPal Account's merchant id.
+	 */
+	public const META_KEY_APP_ID = 'app_id';
+
+	/**
+	 * Name of the extra meta that holds the seller client ID.
+	 */
+	public const META_KEY_CLIENT_ID = 'client_id';
+
+	/**
+	 * Name of the extra meta that holds the seller secret.
+	 */
+	public const META_KEY_CLIENT_SECRET = 'client_secret';
+
+	/**
+	 * Name of the extra meta that stores the expiration date of the Access Token.
+	 */
+	public const META_KEY_TOKEN_EXPIRES_IN = 'expires_in';
+
+	/**
+	 * Name of the extra meta that holds the partner client ID.
+	 */
+	public const META_KEY_PARTNER_CLIENT_ID = 'partner_client_id';
+
+	/**
+	 * Name of the extra meta that holds the partner merchant ID.
+	 */
+	public const META_KEY_PARTNER_MERCHANT_ID = 'partner_merchant_id';
+
+	/**
+	 * Name of the extra meta that holds the seller merchant ID.
+	 */
+	public const META_KEY_SELLER_MERCHANT_ID = 'merchantIdInPayPal';
+
+	/**
+	 * Name of the extra meta that holds the BN / request tracking code.
+	 */
+	public const META_KEY_BN_CODE = 'bn_code';
+
+	/**
+	 * Name of the extra meta that holds the last order details.
+	 */
+	public const META_KEY_LAST_ORDER = 'last_order_details';
+
+	/**
+	 * Name of the extra meta that holds the list of in progress orders.
+	 */
+	public const META_KEY_PAYPAL_ORDERS = 'paypal_orders_list';
+
+	/**
+	 * Name of the extra meta that stores the allowed PP checkout type selected by merchant while onboarding.
+	 */
+	public const META_KEY_ALLOWED_CHECKOUT_TYPE = 'allowed_checkout_type';
+
+	/**
+	 * Name of the extra meta that stores the merchant authorized scopes for our app to work within.
+	 */
+	public const META_KEY_AUTHORIZED_SCOPES = 'authorized_scopes';
+
+	/**
+	 * Name of the extra meta that stores the PP checkout type selected by merchant after onboarding.
+	 */
+	public const META_KEY_CHECKOUT_TYPE = 'checkout_type';
+
+	/**
+	 * Name of the PayPal API parameter that holds the auth code.
+	 */
+	public const API_KEY_AUTH_CODE = 'authCode';
+
+	/**
+	 * Name of the PayPal API parameter that holds the client token.
+	 */
+	public const API_KEY_CLIENT_TOKEN = 'client_token';
+
+	 /**
+	  * Name of the extra meta that holds the seller payer ID.
+	  */
+	public const META_KEY_PAYER_ID = 'payer_id';
+
+	/**
+	 * Name of the PayPal API parameter that holds the client token expiration time.
+	 */
+	public const API_KEY_EXPIRES_IN = 'expires_in';
+
+	/**
+	 * Name of the PayPal API parameter that holds the list of oAuth integrations related to the merchant.
+	 */
+	public const API_PARAM_OAUTH_INTEGRATIONS = 'oauth_integrations';
+
+	/**
+	 * Name of the PayPal API parameter that holds the list of third party permissions that were granted.
+	 */
+	public const API_PARAM_PERMISSIONS_GRANTED = 'oauth_third_party';
+
+	/**
+	 * Name of the PayPal API parameter that holds the bool of if the primary email was confirmed.
+	 */
+	public const API_PARAM_PRIM_EMAIL_CONFIRMED = 'primary_email_confirmed';
+
+	/**
+	 * Name of the PayPal API parameter that holds the bool of if email was confirmed.
+	 */
+	public const API_PARAM_EMAIL_CONFIRMED = 'isEmailConfirmed';
+
+	/**
+	 * Name of the PayPal API parameter that holds the partner ID.
+	 */
+	public const API_PARAM_PARTNER_ID = 'merchantId';
+
+	/**
+	 * Name of the PayPal API parameter that holds the merchant ID in the Track seller onboarding status request.
+	 */
+	public const API_PARAM_TRACK_MERCHANT_ID = 'merchant_id';
+
+	/**
+	 * Name of the PayPal API parameter that holds the payments_receivable status.
+	 */
+	public const API_PARAM_PAYMENTS_RECEIVABLE = 'payments_receivable';
+
+	/**
+	 * Name of the nonce used in the capture order request.
+	 */
+	public const CAPTURE_ORDER_NONCE_NAME = 'eea_pp_commerce_capture_order_payment';
+
+	/**
+	 * Name of the nonce used in the onboarding process.
+	 */
+	public const NONCE_NAME_ONBOARDING_RETURN = 'eea_pp_commerce_onboarding_return';
+
+	/**
+	 * Holds this payment method slug.
+	 */
+	public const PM_SLUG = 'paypalcheckout';
+
+
+	/**
+	 * Returns the base PayPal API URL.
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getPayPalApiUrl(EE_Payment_Method $payment_method): string
+	{
+		return $payment_method->debug_mode() ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com';
+	}
 }

PaymentMethods/PayPalCommerce/api/clients/ClientsApi.php

Indentation +17 added lines, -17 removed lines

@@ -16,24 +16,24 @@
  */
 abstract class ClientsApi
 {
-    protected PayPalApi $api;
+	protected PayPalApi $api;
 
-    protected string $request_url;
+	protected string $request_url;
 
 
-    /**
-     * ClientsApi constructor.
-     *
-     * @param PayPalApi $api
-     * @param bool   $sandbox_mode
-     */
-    public function __construct(PayPalApi $api, bool $sandbox_mode = true)
-    {
-        $this->api         = $api;
-        // Is this a sandbox request.
-        $api_endpoint = $sandbox_mode
-            ? 'https://api-m.sandbox.paypal.com/'
-            : 'https://api-m.paypal.com/';
-        $this->request_url = $api_endpoint . 'v1/identity';
-    }
+	/**
+	 * ClientsApi constructor.
+	 *
+	 * @param PayPalApi $api
+	 * @param bool   $sandbox_mode
+	 */
+	public function __construct(PayPalApi $api, bool $sandbox_mode = true)
+	{
+		$this->api         = $api;
+		// Is this a sandbox request.
+		$api_endpoint = $sandbox_mode
+			? 'https://api-m.sandbox.paypal.com/'
+			: 'https://api-m.paypal.com/';
+		$this->request_url = $api_endpoint . 'v1/identity';
+	}
 }

PaymentMethods/PayPalCommerce/api/clients/ClientToken.php

Indentation +49 added lines, -49 removed lines

@@ -18,57 +18,57 @@
  */
 class ClientToken extends ClientsApi
 {
-    /**
-     * ClientToken constructor.
-     *
-     * @param PayPalApi $api
-     * @param bool      $sandbox_mode
-     */
-    public function __construct(PayPalApi $api, bool $sandbox_mode)
-    {
-        parent::__construct($api, $sandbox_mode);
-        $this->request_url = $this->request_url . "/generate-token";
-    }
+	/**
+	 * ClientToken constructor.
+	 *
+	 * @param PayPalApi $api
+	 * @param bool      $sandbox_mode
+	 */
+	public function __construct(PayPalApi $api, bool $sandbox_mode)
+	{
+		parent::__construct($api, $sandbox_mode);
+		$this->request_url = $this->request_url . "/generate-token";
+	}
 
 
-    /**
-     * Get the onboarding status and validate it.
-     *
-     * @return array
-     */
-    public function getToken(): array
-    {
-        // Send GET request.
-        $response = $this->api->sendRequest([], $this->request_url);
-        return $this->validateResponse($response);
-    }
+	/**
+	 * Get the onboarding status and validate it.
+	 *
+	 * @return array
+	 */
+	public function getToken(): array
+	{
+		// Send GET request.
+		$response = $this->api->sendRequest([], $this->request_url);
+		return $this->validateResponse($response);
+	}
 
 
-    /**
-     * Makes sure that we have received the client token. Returns an error as array if not.
-     *
-     * @param array $response
-     * @return array
-     */
-    public function validateResponse(array $response): array
-    {
-        // Could this be an error ?
-        if (! empty($response['error'])) {
-            return $response;
-        }
-        if (! empty($response['name']) && ! empty($response['message'])) {
-            return ['error' => $response['name'], 'message' => $response['message']];
-        }
-        // Check the data we received.
-        if (empty($response[ Domain::API_KEY_CLIENT_TOKEN ])) {
-            $err_msg = esc_html__('No client token was found in the Client Token request response.', 'event_espresso');
-            PayPalLogger::errorLog($err_msg, $response);
-            return ['error' => 'ONBOARDING_MISSING_CLIENT_TOKEN', 'message' => $err_msg];
-        }
-        return [
-            'valid'        => true,
-            'client_token' => $response[ Domain::API_KEY_CLIENT_TOKEN ],
-            'expires_in'   => $response[ Domain::API_KEY_EXPIRES_IN ],
-        ];
-    }
+	/**
+	 * Makes sure that we have received the client token. Returns an error as array if not.
+	 *
+	 * @param array $response
+	 * @return array
+	 */
+	public function validateResponse(array $response): array
+	{
+		// Could this be an error ?
+		if (! empty($response['error'])) {
+			return $response;
+		}
+		if (! empty($response['name']) && ! empty($response['message'])) {
+			return ['error' => $response['name'], 'message' => $response['message']];
+		}
+		// Check the data we received.
+		if (empty($response[ Domain::API_KEY_CLIENT_TOKEN ])) {
+			$err_msg = esc_html__('No client token was found in the Client Token request response.', 'event_espresso');
+			PayPalLogger::errorLog($err_msg, $response);
+			return ['error' => 'ONBOARDING_MISSING_CLIENT_TOKEN', 'message' => $err_msg];
+		}
+		return [
+			'valid'        => true,
+			'client_token' => $response[ Domain::API_KEY_CLIENT_TOKEN ],
+			'expires_in'   => $response[ Domain::API_KEY_EXPIRES_IN ],
+		];
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
     public function __construct(PayPalApi $api, bool $sandbox_mode)
     {
         parent::__construct($api, $sandbox_mode);
-        $this->request_url = $this->request_url . "/generate-token";
+        $this->request_url = $this->request_url."/generate-token";
     }
 
 
@@ -53,22 +53,22 @@ 
     public function validateResponse(array $response): array
     {
         // Could this be an error ?
-        if (! empty($response['error'])) {
+        if ( ! empty($response['error'])) {
             return $response;
         }
-        if (! empty($response['name']) && ! empty($response['message'])) {
+        if ( ! empty($response['name']) && ! empty($response['message'])) {
             return ['error' => $response['name'], 'message' => $response['message']];
         }
         // Check the data we received.
-        if (empty($response[ Domain::API_KEY_CLIENT_TOKEN ])) {
+        if (empty($response[Domain::API_KEY_CLIENT_TOKEN])) {
             $err_msg = esc_html__('No client token was found in the Client Token request response.', 'event_espresso');
             PayPalLogger::errorLog($err_msg, $response);
             return ['error' => 'ONBOARDING_MISSING_CLIENT_TOKEN', 'message' => $err_msg];
         }
         return [
             'valid'        => true,
-            'client_token' => $response[ Domain::API_KEY_CLIENT_TOKEN ],
-            'expires_in'   => $response[ Domain::API_KEY_EXPIRES_IN ],
+            'client_token' => $response[Domain::API_KEY_CLIENT_TOKEN],
+            'expires_in'   => $response[Domain::API_KEY_EXPIRES_IN],
         ];
     }
 }