iqltechnologies / brighty

plugins/woocommerce/includes/admin/class-wc-admin-dashboard-setup.php

Indentation +180 added lines, -180 removed lines

@@ -11,190 +11,190 @@
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly.
+    exit; // Exit if accessed directly.
 }
 
 if ( ! class_exists( 'WC_Admin_Dashboard_Setup', false ) ) :
 
-	/**
-	 * WC_Admin_Dashboard_Setup Class.
-	 */
-	class WC_Admin_Dashboard_Setup {
-
-		/**
-		 * Check for task list initialization.
-		 */
-		private $initalized = false;
-
-		/**
-		 * The task list.
-		 */
-		private $task_list = null;
-
-		/**
-		 * The tasks.
-		 */
-		private $tasks = null;
-
-		/**
-		 * # of completed tasks.
-		 *
-		 * @var int
-		 */
-		private $completed_tasks_count = 0;
-
-		/**
-		 * WC_Admin_Dashboard_Setup constructor.
-		 */
-		public function __construct() {
-			if ( $this->should_display_widget() ) {
-				add_meta_box(
-					'wc_admin_dashboard_setup',
-					__( 'WooCommerce Setup', 'woocommerce' ),
-					array( $this, 'render' ),
-					'dashboard',
-					'normal',
-					'high'
-				);
-			}
-		}
-
-		/**
-		 * Render meta box output.
-		 */
-		public function render() {
-			$version = Constants::get_constant( 'WC_VERSION' );
-			wp_enqueue_style( 'wc-dashboard-setup', WC()->plugin_url() . '/assets/css/dashboard-setup.css', array(), $version );
-
-			$task = $this->get_next_task();
-			if ( ! $task ) {
-				return;
-			}
-
-			$button_link           = $this->get_button_link( $task );
-			$completed_tasks_count = $this->get_completed_tasks_count();
-			$step_number           = $this->get_completed_tasks_count() + 1;
-			$tasks_count           = count( $this->get_tasks() );
-
-			// Given 'r' (circle element's r attr), dashoffset = ((100-$desired_percentage)/100) * PI * (r*2).
-			$progress_percentage = ( $completed_tasks_count / $tasks_count ) * 100;
-			$circle_r            = 6.5;
-			$circle_dashoffset   = ( ( 100 - $progress_percentage ) / 100 ) * ( pi() * ( $circle_r * 2 ) );
-
-			include __DIR__ . '/views/html-admin-dashboard-setup.php';
-		}
-
-		/**
-		 * Get the button link for a given task.
-		 *
-		 * @param Task $task Task.
-		 * @return string
-		 */
-		public function get_button_link( $task ) {
-			$url = $task->get_json()['actionUrl'];
-
-			if ( substr( $url, 0, 4 ) === 'http' ) {
-				return $url;
-			} elseif ( $url ) {
-				return wc_admin_url( '&path=' . $url );
-			}
-
-			return admin_url( 'admin.php?page=wc-admin&task=' . $task->get_id() );
-		}
-
-		/**
-		 * Get the task list.
-		 *
-		 * @return array
-		 */
-		public function get_task_list() {
-			if ( $this->task_list || $this->initalized ) {
-				return $this->task_list;
-			}
-
-			$this->set_task_list( TaskLists::get_list( 'setup' ) );
-			$this->initalized = true;
-			return $this->task_list;
-		}
-
-		/**
-		 * Set the task list.
-		 */
-		public function set_task_list( $task_list ) {
-			return $this->task_list = $task_list;
-		}
-
-		/**
-		 * Get the tasks.
-		 *
-		 * @return array
-		 */
-		public function get_tasks() {
-			if ( $this->tasks ) {
-				return $this->tasks;
-			}
-
-			$this->tasks = $this->get_task_list()->get_viewable_tasks();
-			return $this->tasks;
-		}
-
-		/**
-		 * Return # of completed tasks
-		 *
-		 * @return integer
-		 */
-		public function get_completed_tasks_count() {
-			$completed_tasks = array_filter(
-				$this->get_tasks(),
-				function( $task ) {
-					return $task->is_complete();
-				}
-			);
-
-			return count( $completed_tasks );
-		}
-
-		/**
-		 * Get the next task.
-		 *
-		 * @return array|null
-		 */
-		private function get_next_task() {
-			foreach ( $this->get_tasks() as $task ) {
-				if ( false === $task->is_complete() ) {
-					return $task;
-				}
-			}
-
-			return null;
-		}
-
-		/**
-		 * Check to see if we should display the widget
-		 *
-		 * @return bool
-		 */
-		public function should_display_widget() {
-			if ( ! class_exists( 'Automattic\WooCommerce\Admin\Features\Features' ) || ! class_exists( 'Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists' ) ) {
-				return false;
-			}
-
-			if ( ! Features::is_enabled( 'onboarding' ) || ! WC()->is_wc_admin_active() ) {
-				return false;
-			}
-
-			if ( ! current_user_can( 'manage_woocommerce' ) ) {
-				return false;
-			}
-
-			if ( ! $this->get_task_list() || $this->get_task_list()->is_complete() || $this->get_task_list()->is_hidden() ) {
-				return false;
-			}
-
-			return true;
-		}
-
-	}
+    /**
+     * WC_Admin_Dashboard_Setup Class.
+     */
+    class WC_Admin_Dashboard_Setup {
+
+        /**
+         * Check for task list initialization.
+         */
+        private $initalized = false;
+
+        /**
+         * The task list.
+         */
+        private $task_list = null;
+
+        /**
+         * The tasks.
+         */
+        private $tasks = null;
+
+        /**
+         * # of completed tasks.
+         *
+         * @var int
+         */
+        private $completed_tasks_count = 0;
+
+        /**
+         * WC_Admin_Dashboard_Setup constructor.
+         */
+        public function __construct() {
+            if ( $this->should_display_widget() ) {
+                add_meta_box(
+                    'wc_admin_dashboard_setup',
+                    __( 'WooCommerce Setup', 'woocommerce' ),
+                    array( $this, 'render' ),
+                    'dashboard',
+                    'normal',
+                    'high'
+                );
+            }
+        }
+
+        /**
+         * Render meta box output.
+         */
+        public function render() {
+            $version = Constants::get_constant( 'WC_VERSION' );
+            wp_enqueue_style( 'wc-dashboard-setup', WC()->plugin_url() . '/assets/css/dashboard-setup.css', array(), $version );
+
+            $task = $this->get_next_task();
+            if ( ! $task ) {
+                return;
+            }
+
+            $button_link           = $this->get_button_link( $task );
+            $completed_tasks_count = $this->get_completed_tasks_count();
+            $step_number           = $this->get_completed_tasks_count() + 1;
+            $tasks_count           = count( $this->get_tasks() );
+
+            // Given 'r' (circle element's r attr), dashoffset = ((100-$desired_percentage)/100) * PI * (r*2).
+            $progress_percentage = ( $completed_tasks_count / $tasks_count ) * 100;
+            $circle_r            = 6.5;
+            $circle_dashoffset   = ( ( 100 - $progress_percentage ) / 100 ) * ( pi() * ( $circle_r * 2 ) );
+
+            include __DIR__ . '/views/html-admin-dashboard-setup.php';
+        }
+
+        /**
+         * Get the button link for a given task.
+         *
+         * @param Task $task Task.
+         * @return string
+         */
+        public function get_button_link( $task ) {
+            $url = $task->get_json()['actionUrl'];
+
+            if ( substr( $url, 0, 4 ) === 'http' ) {
+                return $url;
+            } elseif ( $url ) {
+                return wc_admin_url( '&path=' . $url );
+            }
+
+            return admin_url( 'admin.php?page=wc-admin&task=' . $task->get_id() );
+        }
+
+        /**
+         * Get the task list.
+         *
+         * @return array
+         */
+        public function get_task_list() {
+            if ( $this->task_list || $this->initalized ) {
+                return $this->task_list;
+            }
+
+            $this->set_task_list( TaskLists::get_list( 'setup' ) );
+            $this->initalized = true;
+            return $this->task_list;
+        }
+
+        /**
+         * Set the task list.
+         */
+        public function set_task_list( $task_list ) {
+            return $this->task_list = $task_list;
+        }
+
+        /**
+         * Get the tasks.
+         *
+         * @return array
+         */
+        public function get_tasks() {
+            if ( $this->tasks ) {
+                return $this->tasks;
+            }
+
+            $this->tasks = $this->get_task_list()->get_viewable_tasks();
+            return $this->tasks;
+        }
+
+        /**
+         * Return # of completed tasks
+         *
+         * @return integer
+         */
+        public function get_completed_tasks_count() {
+            $completed_tasks = array_filter(
+                $this->get_tasks(),
+                function( $task ) {
+                    return $task->is_complete();
+                }
+            );
+
+            return count( $completed_tasks );
+        }
+
+        /**
+         * Get the next task.
+         *
+         * @return array|null
+         */
+        private function get_next_task() {
+            foreach ( $this->get_tasks() as $task ) {
+                if ( false === $task->is_complete() ) {
+                    return $task;
+                }
+            }
+
+            return null;
+        }
+
+        /**
+         * Check to see if we should display the widget
+         *
+         * @return bool
+         */
+        public function should_display_widget() {
+            if ( ! class_exists( 'Automattic\WooCommerce\Admin\Features\Features' ) || ! class_exists( 'Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists' ) ) {
+                return false;
+            }
+
+            if ( ! Features::is_enabled( 'onboarding' ) || ! WC()->is_wc_admin_active() ) {
+                return false;
+            }
+
+            if ( ! current_user_can( 'manage_woocommerce' ) ) {
+                return false;
+            }
+
+            if ( ! $this->get_task_list() || $this->get_task_list()->is_complete() || $this->get_task_list()->is_hidden() ) {
+                return false;
+            }
+
+            return true;
+        }
+
+    }
 
 endif;
 

Spacing +29 added lines, -29 removed lines

@@ -10,11 +10,11 @@ 
 use Automattic\WooCommerce\Admin\Features\Features;
 use Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
-if ( ! class_exists( 'WC_Admin_Dashboard_Setup', false ) ) :
+if (!class_exists('WC_Admin_Dashboard_Setup', false)) :
 
 	/**
 	 * WC_Admin_Dashboard_Setup Class.
@@ -47,11 +47,11 @@ 
 		 * WC_Admin_Dashboard_Setup constructor.
 		 */
 		public function __construct() {
-			if ( $this->should_display_widget() ) {
+			if ($this->should_display_widget()) {
 				add_meta_box(
 					'wc_admin_dashboard_setup',
-					__( 'WooCommerce Setup', 'woocommerce' ),
-					array( $this, 'render' ),
+					__('WooCommerce Setup', 'woocommerce'),
+					array($this, 'render'),
 					'dashboard',
 					'normal',
 					'high'
@@ -63,23 +63,23 @@ 
 		 * Render meta box output.
 		 */
 		public function render() {
-			$version = Constants::get_constant( 'WC_VERSION' );
-			wp_enqueue_style( 'wc-dashboard-setup', WC()->plugin_url() . '/assets/css/dashboard-setup.css', array(), $version );
+			$version = Constants::get_constant('WC_VERSION');
+			wp_enqueue_style('wc-dashboard-setup', WC()->plugin_url() . '/assets/css/dashboard-setup.css', array(), $version);
 
 			$task = $this->get_next_task();
-			if ( ! $task ) {
+			if (!$task) {
 				return;
 			}
 
-			$button_link           = $this->get_button_link( $task );
+			$button_link           = $this->get_button_link($task);
 			$completed_tasks_count = $this->get_completed_tasks_count();
 			$step_number           = $this->get_completed_tasks_count() + 1;
-			$tasks_count           = count( $this->get_tasks() );
+			$tasks_count           = count($this->get_tasks());
 
 			// Given 'r' (circle element's r attr), dashoffset = ((100-$desired_percentage)/100) * PI * (r*2).
-			$progress_percentage = ( $completed_tasks_count / $tasks_count ) * 100;
+			$progress_percentage = ($completed_tasks_count / $tasks_count) * 100;
 			$circle_r            = 6.5;
-			$circle_dashoffset   = ( ( 100 - $progress_percentage ) / 100 ) * ( pi() * ( $circle_r * 2 ) );
+			$circle_dashoffset   = ((100 - $progress_percentage) / 100) * (pi() * ($circle_r * 2));
 
 			include __DIR__ . '/views/html-admin-dashboard-setup.php';
 		}
@@ -90,16 +90,16 @@ 
 		 * @param Task $task Task.
 		 * @return string
 		 */
-		public function get_button_link( $task ) {
+		public function get_button_link($task) {
 			$url = $task->get_json()['actionUrl'];
 
-			if ( substr( $url, 0, 4 ) === 'http' ) {
+			if (substr($url, 0, 4) === 'http') {
 				return $url;
-			} elseif ( $url ) {
-				return wc_admin_url( '&path=' . $url );
+			} elseif ($url) {
+				return wc_admin_url('&path=' . $url);
 			}
 
-			return admin_url( 'admin.php?page=wc-admin&task=' . $task->get_id() );
+			return admin_url('admin.php?page=wc-admin&task=' . $task->get_id());
 		}
 
 		/**
@@ -108,11 +108,11 @@ 
 		 * @return array
 		 */
 		public function get_task_list() {
-			if ( $this->task_list || $this->initalized ) {
+			if ($this->task_list || $this->initalized) {
 				return $this->task_list;
 			}
 
-			$this->set_task_list( TaskLists::get_list( 'setup' ) );
+			$this->set_task_list(TaskLists::get_list('setup'));
 			$this->initalized = true;
 			return $this->task_list;
 		}
@@ -120,7 +120,7 @@ 
 		/**
 		 * Set the task list.
 		 */
-		public function set_task_list( $task_list ) {
+		public function set_task_list($task_list) {
 			return $this->task_list = $task_list;
 		}
 
@@ -130,7 +130,7 @@ 
 		 * @return array
 		 */
 		public function get_tasks() {
-			if ( $this->tasks ) {
+			if ($this->tasks) {
 				return $this->tasks;
 			}
 
@@ -146,12 +146,12 @@ 
 		public function get_completed_tasks_count() {
 			$completed_tasks = array_filter(
 				$this->get_tasks(),
-				function( $task ) {
+				function($task) {
 					return $task->is_complete();
 				}
 			);
 
-			return count( $completed_tasks );
+			return count($completed_tasks);
 		}
 
 		/**
@@ -160,8 +160,8 @@ 
 		 * @return array|null
 		 */
 		private function get_next_task() {
-			foreach ( $this->get_tasks() as $task ) {
-				if ( false === $task->is_complete() ) {
+			foreach ($this->get_tasks() as $task) {
+				if (false === $task->is_complete()) {
 					return $task;
 				}
 			}
@@ -175,19 +175,19 @@ 
 		 * @return bool
 		 */
 		public function should_display_widget() {
-			if ( ! class_exists( 'Automattic\WooCommerce\Admin\Features\Features' ) || ! class_exists( 'Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists' ) ) {
+			if (!class_exists('Automattic\WooCommerce\Admin\Features\Features') || !class_exists('Automattic\WooCommerce\Admin\Features\OnboardingTasks\TaskLists')) {
 				return false;
 			}
 
-			if ( ! Features::is_enabled( 'onboarding' ) || ! WC()->is_wc_admin_active() ) {
+			if (!Features::is_enabled('onboarding') || !WC()->is_wc_admin_active()) {
 				return false;
 			}
 
-			if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			if (!current_user_can('manage_woocommerce')) {
 				return false;
 			}
 
-			if ( ! $this->get_task_list() || $this->get_task_list()->is_complete() || $this->get_task_list()->is_hidden() ) {
+			if (!$this->get_task_list() || $this->get_task_list()->is_complete() || $this->get_task_list()->is_hidden()) {
 				return false;
 			}
 

plugins/woocommerce/includes/admin/class-wc-admin-webhooks.php

Indentation +355 added lines, -355 removed lines

@@ -13,365 +13,365 @@
  */
 class WC_Admin_Webhooks {
 
-	/**
-	 * Initialize the webhooks admin actions.
-	 */
-	public function __construct() {
-		add_action( 'admin_init', array( $this, 'actions' ) );
-		add_action( 'woocommerce_settings_page_init', array( $this, 'screen_option' ) );
-		add_filter( 'woocommerce_save_settings_advanced_webhooks', array( $this, 'allow_save_settings' ) );
-	}
-
-	/**
-	 * Check if should allow save settings.
-	 * This prevents "Your settings have been saved." notices on the table list.
-	 *
-	 * @param  bool $allow If allow save settings.
-	 * @return bool
-	 */
-	public function allow_save_settings( $allow ) {
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! isset( $_GET['edit-webhook'] ) ) {
-			return false;
-		}
-
-		return $allow;
-	}
-
-	/**
-	 * Check if is webhook settings page.
-	 *
-	 * @return bool
-	 */
-	private function is_webhook_settings_page() {
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'advanced' === $_GET['tab'] && 'webhooks' === $_GET['section'];
-	}
-
-	/**
-	 * Save method.
-	 */
-	private function save() {
-		check_admin_referer( 'woocommerce-settings' );
-
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
-			wp_die( esc_html__( 'You do not have permission to update Webhooks', 'woocommerce' ) );
-		}
-
-		$errors = array();
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$webhook_id = isset( $_POST['webhook_id'] ) ? absint( $_POST['webhook_id'] ) : 0;
-		$webhook    = new WC_Webhook( $webhook_id );
-
-		// Name.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! empty( $_POST['webhook_name'] ) ) {
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$name = sanitize_text_field( wp_unslash( $_POST['webhook_name'] ) );
-		} else {
-			$name = sprintf(
-				/* translators: %s: date */
-				__( 'Webhook created on %s', 'woocommerce' ),
-				// @codingStandardsIgnoreStart
-				(new DateTime('now'))->format( _x( 'M d, Y @ h:i A', 'Webhook created on date parsed by DateTime::format', 'woocommerce' ) )
-				// @codingStandardsIgnoreEnd
-			);
-		}
-
-		$webhook->set_name( $name );
-
-		if ( ! $webhook->get_user_id() ) {
-			$webhook->set_user_id( get_current_user_id() );
-		}
-
-		// Status.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$webhook->set_status( ! empty( $_POST['webhook_status'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_status'] ) ) : 'disabled' );
-
-		// Delivery URL.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? esc_url_raw( wp_unslash( $_POST['webhook_delivery_url'] ) ) : '';
-
-		if ( wc_is_valid_url( $delivery_url ) ) {
-			$webhook->set_delivery_url( $delivery_url );
-		}
-
-		// Secret.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$secret = ! empty( $_POST['webhook_secret'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_secret'] ) ) : wp_generate_password( 50, true, true );
-		$webhook->set_secret( $secret );
-
-		// Topic.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! empty( $_POST['webhook_topic'] ) ) {
-			$resource = '';
-			$event    = '';
-
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			switch ( $_POST['webhook_topic'] ) {
-				case 'action':
-					$resource = 'action';
-					// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$event = ! empty( $_POST['webhook_action_event'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_action_event'] ) ) : '';
-					break;
-
-				default:
-					// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					list( $resource, $event ) = explode( '.', sanitize_text_field( wp_unslash( $_POST['webhook_topic'] ) ) );
-					break;
-			}
-
-			$topic = $resource . '.' . $event;
-
-			if ( wc_is_webhook_valid_topic( $topic ) ) {
-				$webhook->set_topic( $topic );
-			} else {
-				$errors[] = __( 'Webhook topic unknown. Please select a valid topic.', 'woocommerce' );
-			}
-		}
-
-		// API version.
-		$rest_api_versions = wc_get_webhook_rest_api_versions();
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$webhook->set_api_version( ! empty( $_POST['webhook_api_version'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_api_version'] ) ) : end( $rest_api_versions ) );
-
-		$webhook->save();
-
-		// Run actions.
-		do_action( 'woocommerce_webhook_options_save', $webhook->get_id() );
-		if ( $errors ) {
-			// Redirect to webhook edit page to avoid settings save actions.
-			wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( implode( '|', $errors ) ) ) );
-			exit();
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		} elseif ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $webhook->get_pending_delivery() ) {
-			// Ping the webhook at the first time that is activated.
-			$result = $webhook->deliver_ping();
-
-			if ( is_wp_error( $result ) ) {
-				// Redirect to webhook edit page to avoid settings save actions.
-				wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( $result->get_error_message() ) ) );
-				exit();
-			}
-		}
-
-		// Redirect to webhook edit page to avoid settings save actions.
-		wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&updated=1' ) );
-		exit();
-	}
-
-	/**
-	 * Bulk delete.
-	 *
-	 * @param array $webhooks List of webhooks IDs.
-	 */
-	public static function bulk_delete( $webhooks ) {
-		foreach ( $webhooks as $webhook_id ) {
-			$webhook = new WC_Webhook( (int) $webhook_id );
-			$webhook->delete( true );
-		}
-
-		$qty = count( $webhooks );
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( wp_unslash( $_GET['status'] ) ) : '';
-
-		// Redirect to webhooks page.
-		wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks' . $status . '&deleted=' . $qty ) );
-		exit();
-	}
-
-	/**
-	 * Delete webhook.
-	 */
-	private function delete() {
-		check_admin_referer( 'delete-webhook' );
-
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['delete'] ) ) {
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$webhook_id = absint( $_GET['delete'] );
-
-			if ( $webhook_id ) {
-				$this->bulk_delete( array( $webhook_id ) );
-			}
-		}
-	}
-
-	/**
-	 * Webhooks admin actions.
-	 */
-	public function actions() {
-		if ( $this->is_webhook_settings_page() ) {
-			// Save.
-			// phpcs:ignore WordPress.Security.NonceVerification.Missing
-			if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) {
-				$this->save();
-			}
-
-			// Delete webhook.
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			if ( isset( $_GET['delete'] ) ) {
-				$this->delete();
-			}
-		}
-	}
-
-	/**
-	 * Page output.
-	 */
-	public static function page_output() {
-		// Hide the save button.
-		$GLOBALS['hide_save_button'] = true;
-
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['edit-webhook'] ) ) {
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$webhook_id = absint( $_GET['edit-webhook'] );
-			$webhook    = new WC_Webhook( $webhook_id );
-
-			include __DIR__ . '/settings/views/html-webhooks-edit.php';
-			return;
-		}
-
-		self::table_list_output();
-	}
-
-	/**
-	 * Notices.
-	 */
-	public static function notices() {
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['deleted'] ) ) {
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$deleted = absint( $_GET['deleted'] );
-
-			/* translators: %d: count */
-			WC_Admin_Settings::add_message( sprintf( _n( '%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) );
-		}
-
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['updated'] ) ) {
-			WC_Admin_Settings::add_message( __( 'Webhook updated successfully.', 'woocommerce' ) );
-		}
-
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['created'] ) ) {
-			WC_Admin_Settings::add_message( __( 'Webhook created successfully.', 'woocommerce' ) );
-		}
-
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['error'] ) ) {
-			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			foreach ( explode( '|', sanitize_text_field( wp_unslash( $_GET['error'] ) ) ) as $message ) {
-				WC_Admin_Settings::add_error( trim( $message ) );
-			}
-		}
-	}
-
-	/**
-	 * Add screen option.
-	 */
-	public function screen_option() {
-		global $webhooks_table_list;
-
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! isset( $_GET['edit-webhook'] ) && $this->is_webhook_settings_page() ) {
-			$webhooks_table_list = new WC_Admin_Webhooks_Table_List();
-
-			// Add screen option.
-			add_screen_option(
-				'per_page',
-				array(
-					'default' => 10,
-					'option'  => 'woocommerce_webhooks_per_page',
-				)
-			);
-		}
-	}
-
-	/**
-	 * Table list output.
-	 */
-	private static function table_list_output() {
-		global $webhooks_table_list;
-
-		echo '<h2 class="wc-table-list-header">' . esc_html__( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0' ) ) . '" class="add-new-h2">' . esc_html__( 'Add webhook', 'woocommerce' ) . '</a></h2>';
-
-		// Get the webhooks count.
-		$data_store   = WC_Data_Store::load( 'webhook' );
-		$num_webhooks = $data_store->get_count_webhooks_by_status();
-		$count        = array_sum( $num_webhooks );
-
-		if ( 0 < $count ) {
-			$webhooks_table_list->process_bulk_action();
-			$webhooks_table_list->prepare_items();
-
-			echo '<input type="hidden" name="page" value="wc-settings" />';
-			echo '<input type="hidden" name="tab" value="advanced" />';
-			echo '<input type="hidden" name="section" value="webhooks" />';
-
-			$webhooks_table_list->views();
-			$webhooks_table_list->search_box( __( 'Search webhooks', 'woocommerce' ), 'webhook' );
-			$webhooks_table_list->display();
-		} else {
-			echo '<div class="woocommerce-BlankState woocommerce-BlankState--webhooks">';
-			?>
+    /**
+     * Initialize the webhooks admin actions.
+     */
+    public function __construct() {
+        add_action( 'admin_init', array( $this, 'actions' ) );
+        add_action( 'woocommerce_settings_page_init', array( $this, 'screen_option' ) );
+        add_filter( 'woocommerce_save_settings_advanced_webhooks', array( $this, 'allow_save_settings' ) );
+    }
+
+    /**
+     * Check if should allow save settings.
+     * This prevents "Your settings have been saved." notices on the table list.
+     *
+     * @param  bool $allow If allow save settings.
+     * @return bool
+     */
+    public function allow_save_settings( $allow ) {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( ! isset( $_GET['edit-webhook'] ) ) {
+            return false;
+        }
+
+        return $allow;
+    }
+
+    /**
+     * Check if is webhook settings page.
+     *
+     * @return bool
+     */
+    private function is_webhook_settings_page() {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'advanced' === $_GET['tab'] && 'webhooks' === $_GET['section'];
+    }
+
+    /**
+     * Save method.
+     */
+    private function save() {
+        check_admin_referer( 'woocommerce-settings' );
+
+        if ( ! current_user_can( 'manage_woocommerce' ) ) {
+            wp_die( esc_html__( 'You do not have permission to update Webhooks', 'woocommerce' ) );
+        }
+
+        $errors = array();
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $webhook_id = isset( $_POST['webhook_id'] ) ? absint( $_POST['webhook_id'] ) : 0;
+        $webhook    = new WC_Webhook( $webhook_id );
+
+        // Name.
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( ! empty( $_POST['webhook_name'] ) ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $name = sanitize_text_field( wp_unslash( $_POST['webhook_name'] ) );
+        } else {
+            $name = sprintf(
+                /* translators: %s: date */
+                __( 'Webhook created on %s', 'woocommerce' ),
+                // @codingStandardsIgnoreStart
+                (new DateTime('now'))->format( _x( 'M d, Y @ h:i A', 'Webhook created on date parsed by DateTime::format', 'woocommerce' ) )
+                // @codingStandardsIgnoreEnd
+            );
+        }
+
+        $webhook->set_name( $name );
+
+        if ( ! $webhook->get_user_id() ) {
+            $webhook->set_user_id( get_current_user_id() );
+        }
+
+        // Status.
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $webhook->set_status( ! empty( $_POST['webhook_status'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_status'] ) ) : 'disabled' );
+
+        // Delivery URL.
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? esc_url_raw( wp_unslash( $_POST['webhook_delivery_url'] ) ) : '';
+
+        if ( wc_is_valid_url( $delivery_url ) ) {
+            $webhook->set_delivery_url( $delivery_url );
+        }
+
+        // Secret.
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $secret = ! empty( $_POST['webhook_secret'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_secret'] ) ) : wp_generate_password( 50, true, true );
+        $webhook->set_secret( $secret );
+
+        // Topic.
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( ! empty( $_POST['webhook_topic'] ) ) {
+            $resource = '';
+            $event    = '';
+
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            switch ( $_POST['webhook_topic'] ) {
+                case 'action':
+                    $resource = 'action';
+                    // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $event = ! empty( $_POST['webhook_action_event'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_action_event'] ) ) : '';
+                    break;
+
+                default:
+                    // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    list( $resource, $event ) = explode( '.', sanitize_text_field( wp_unslash( $_POST['webhook_topic'] ) ) );
+                    break;
+            }
+
+            $topic = $resource . '.' . $event;
+
+            if ( wc_is_webhook_valid_topic( $topic ) ) {
+                $webhook->set_topic( $topic );
+            } else {
+                $errors[] = __( 'Webhook topic unknown. Please select a valid topic.', 'woocommerce' );
+            }
+        }
+
+        // API version.
+        $rest_api_versions = wc_get_webhook_rest_api_versions();
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $webhook->set_api_version( ! empty( $_POST['webhook_api_version'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_api_version'] ) ) : end( $rest_api_versions ) );
+
+        $webhook->save();
+
+        // Run actions.
+        do_action( 'woocommerce_webhook_options_save', $webhook->get_id() );
+        if ( $errors ) {
+            // Redirect to webhook edit page to avoid settings save actions.
+            wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( implode( '|', $errors ) ) ) );
+            exit();
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        } elseif ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $webhook->get_pending_delivery() ) {
+            // Ping the webhook at the first time that is activated.
+            $result = $webhook->deliver_ping();
+
+            if ( is_wp_error( $result ) ) {
+                // Redirect to webhook edit page to avoid settings save actions.
+                wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( $result->get_error_message() ) ) );
+                exit();
+            }
+        }
+
+        // Redirect to webhook edit page to avoid settings save actions.
+        wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&updated=1' ) );
+        exit();
+    }
+
+    /**
+     * Bulk delete.
+     *
+     * @param array $webhooks List of webhooks IDs.
+     */
+    public static function bulk_delete( $webhooks ) {
+        foreach ( $webhooks as $webhook_id ) {
+            $webhook = new WC_Webhook( (int) $webhook_id );
+            $webhook->delete( true );
+        }
+
+        $qty = count( $webhooks );
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( wp_unslash( $_GET['status'] ) ) : '';
+
+        // Redirect to webhooks page.
+        wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks' . $status . '&deleted=' . $qty ) );
+        exit();
+    }
+
+    /**
+     * Delete webhook.
+     */
+    private function delete() {
+        check_admin_referer( 'delete-webhook' );
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_GET['delete'] ) ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $webhook_id = absint( $_GET['delete'] );
+
+            if ( $webhook_id ) {
+                $this->bulk_delete( array( $webhook_id ) );
+            }
+        }
+    }
+
+    /**
+     * Webhooks admin actions.
+     */
+    public function actions() {
+        if ( $this->is_webhook_settings_page() ) {
+            // Save.
+            // phpcs:ignore WordPress.Security.NonceVerification.Missing
+            if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) {
+                $this->save();
+            }
+
+            // Delete webhook.
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            if ( isset( $_GET['delete'] ) ) {
+                $this->delete();
+            }
+        }
+    }
+
+    /**
+     * Page output.
+     */
+    public static function page_output() {
+        // Hide the save button.
+        $GLOBALS['hide_save_button'] = true;
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_GET['edit-webhook'] ) ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $webhook_id = absint( $_GET['edit-webhook'] );
+            $webhook    = new WC_Webhook( $webhook_id );
+
+            include __DIR__ . '/settings/views/html-webhooks-edit.php';
+            return;
+        }
+
+        self::table_list_output();
+    }
+
+    /**
+     * Notices.
+     */
+    public static function notices() {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_GET['deleted'] ) ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $deleted = absint( $_GET['deleted'] );
+
+            /* translators: %d: count */
+            WC_Admin_Settings::add_message( sprintf( _n( '%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) );
+        }
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_GET['updated'] ) ) {
+            WC_Admin_Settings::add_message( __( 'Webhook updated successfully.', 'woocommerce' ) );
+        }
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_GET['created'] ) ) {
+            WC_Admin_Settings::add_message( __( 'Webhook created successfully.', 'woocommerce' ) );
+        }
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_GET['error'] ) ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            foreach ( explode( '|', sanitize_text_field( wp_unslash( $_GET['error'] ) ) ) as $message ) {
+                WC_Admin_Settings::add_error( trim( $message ) );
+            }
+        }
+    }
+
+    /**
+     * Add screen option.
+     */
+    public function screen_option() {
+        global $webhooks_table_list;
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( ! isset( $_GET['edit-webhook'] ) && $this->is_webhook_settings_page() ) {
+            $webhooks_table_list = new WC_Admin_Webhooks_Table_List();
+
+            // Add screen option.
+            add_screen_option(
+                'per_page',
+                array(
+                    'default' => 10,
+                    'option'  => 'woocommerce_webhooks_per_page',
+                )
+            );
+        }
+    }
+
+    /**
+     * Table list output.
+     */
+    private static function table_list_output() {
+        global $webhooks_table_list;
+
+        echo '<h2 class="wc-table-list-header">' . esc_html__( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0' ) ) . '" class="add-new-h2">' . esc_html__( 'Add webhook', 'woocommerce' ) . '</a></h2>';
+
+        // Get the webhooks count.
+        $data_store   = WC_Data_Store::load( 'webhook' );
+        $num_webhooks = $data_store->get_count_webhooks_by_status();
+        $count        = array_sum( $num_webhooks );
+
+        if ( 0 < $count ) {
+            $webhooks_table_list->process_bulk_action();
+            $webhooks_table_list->prepare_items();
+
+            echo '<input type="hidden" name="page" value="wc-settings" />';
+            echo '<input type="hidden" name="tab" value="advanced" />';
+            echo '<input type="hidden" name="section" value="webhooks" />';
+
+            $webhooks_table_list->views();
+            $webhooks_table_list->search_box( __( 'Search webhooks', 'woocommerce' ), 'webhook' );
+            $webhooks_table_list->display();
+        } else {
+            echo '<div class="woocommerce-BlankState woocommerce-BlankState--webhooks">';
+            ?>
 			<h2 class="woocommerce-BlankState-message"><?php esc_html_e( 'Webhooks are event notifications sent to URLs of your choice. They can be used to integrate with third-party services which support them.', 'woocommerce' ); ?></h2>
 			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0' ) ); ?>"><?php esc_html_e( 'Create a new webhook', 'woocommerce' ); ?></a>
 			<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions { display: none; }</style>
 			<?php
-		}
-	}
-
-	/**
-	 * Logs output.
-	 *
-	 * @deprecated 3.3.0
-	 * @param WC_Webhook $webhook Deprecated.
-	 */
-	public static function logs_output( $webhook = 'deprecated' ) {
-		wc_deprecated_function( 'WC_Admin_Webhooks::logs_output', '3.3' );
-	}
-
-	/**
-	 * Get the webhook topic data.
-	 *
-	 * @param WC_Webhook $webhook Webhook instance.
-	 *
-	 * @return array
-	 */
-	public static function get_topic_data( $webhook ) {
-		$topic    = $webhook->get_topic();
-		$event    = '';
-		$resource = '';
-
-		if ( $topic ) {
-			list( $resource, $event ) = explode( '.', $topic );
-
-			if ( 'action' === $resource ) {
-				$topic = 'action';
-			} elseif ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ), true ) ) {
-				$topic = 'custom';
-			}
-		}
-
-		return array(
-			'topic'    => $topic,
-			'event'    => $event,
-			'resource' => $resource,
-		);
-	}
-
-	/**
-	 * Get the logs navigation.
-	 *
-	 * @deprecated 3.3.0
-	 * @param int        $total Deprecated.
-	 * @param WC_Webhook $webhook Deprecated.
-	 */
-	public static function get_logs_navigation( $total, $webhook ) {
-		wc_deprecated_function( 'WC_Admin_Webhooks::get_logs_navigation', '3.3' );
-	}
+        }
+    }
+
+    /**
+     * Logs output.
+     *
+     * @deprecated 3.3.0
+     * @param WC_Webhook $webhook Deprecated.
+     */
+    public static function logs_output( $webhook = 'deprecated' ) {
+        wc_deprecated_function( 'WC_Admin_Webhooks::logs_output', '3.3' );
+    }
+
+    /**
+     * Get the webhook topic data.
+     *
+     * @param WC_Webhook $webhook Webhook instance.
+     *
+     * @return array
+     */
+    public static function get_topic_data( $webhook ) {
+        $topic    = $webhook->get_topic();
+        $event    = '';
+        $resource = '';
+
+        if ( $topic ) {
+            list( $resource, $event ) = explode( '.', $topic );
+
+            if ( 'action' === $resource ) {
+                $topic = 'action';
+            } elseif ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ), true ) ) {
+                $topic = 'custom';
+            }
+        }
+
+        return array(
+            'topic'    => $topic,
+            'event'    => $event,
+            'resource' => $resource,
+        );
+    }
+
+    /**
+     * Get the logs navigation.
+     *
+     * @deprecated 3.3.0
+     * @param int        $total Deprecated.
+     * @param WC_Webhook $webhook Deprecated.
+     */
+    public static function get_logs_navigation( $total, $webhook ) {
+        wc_deprecated_function( 'WC_Admin_Webhooks::get_logs_navigation', '3.3' );
+    }
 }
 
 new WC_Admin_Webhooks();

Spacing +85 added lines, -85 removed lines

@@ -6,7 +6,7 @@ 
  * @version 3.3.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Webhooks.
@@ -17,9 +17,9 @@ 
 	 * Initialize the webhooks admin actions.
 	 */
 	public function __construct() {
-		add_action( 'admin_init', array( $this, 'actions' ) );
-		add_action( 'woocommerce_settings_page_init', array( $this, 'screen_option' ) );
-		add_filter( 'woocommerce_save_settings_advanced_webhooks', array( $this, 'allow_save_settings' ) );
+		add_action('admin_init', array($this, 'actions'));
+		add_action('woocommerce_settings_page_init', array($this, 'screen_option'));
+		add_filter('woocommerce_save_settings_advanced_webhooks', array($this, 'allow_save_settings'));
 	}
 
 	/**
@@ -29,9 +29,9 @@ 
 	 * @param  bool $allow If allow save settings.
 	 * @return bool
 	 */
-	public function allow_save_settings( $allow ) {
+	public function allow_save_settings($allow) {
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! isset( $_GET['edit-webhook'] ) ) {
+		if (!isset($_GET['edit-webhook'])) {
 			return false;
 		}
 
@@ -45,118 +45,118 @@ 
 	 */
 	private function is_webhook_settings_page() {
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'advanced' === $_GET['tab'] && 'webhooks' === $_GET['section'];
+		return isset($_GET['page'], $_GET['tab'], $_GET['section']) && 'wc-settings' === $_GET['page'] && 'advanced' === $_GET['tab'] && 'webhooks' === $_GET['section'];
 	}
 
 	/**
 	 * Save method.
 	 */
 	private function save() {
-		check_admin_referer( 'woocommerce-settings' );
+		check_admin_referer('woocommerce-settings');
 
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
-			wp_die( esc_html__( 'You do not have permission to update Webhooks', 'woocommerce' ) );
+		if (!current_user_can('manage_woocommerce')) {
+			wp_die(esc_html__('You do not have permission to update Webhooks', 'woocommerce'));
 		}
 
 		$errors = array();
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$webhook_id = isset( $_POST['webhook_id'] ) ? absint( $_POST['webhook_id'] ) : 0;
-		$webhook    = new WC_Webhook( $webhook_id );
+		$webhook_id = isset($_POST['webhook_id']) ? absint($_POST['webhook_id']) : 0;
+		$webhook    = new WC_Webhook($webhook_id);
 
 		// Name.
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! empty( $_POST['webhook_name'] ) ) {
+		if (!empty($_POST['webhook_name'])) {
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$name = sanitize_text_field( wp_unslash( $_POST['webhook_name'] ) );
+			$name = sanitize_text_field(wp_unslash($_POST['webhook_name']));
 		} else {
 			$name = sprintf(
 				/* translators: %s: date */
-				__( 'Webhook created on %s', 'woocommerce' ),
+				__('Webhook created on %s', 'woocommerce'),
 				// @codingStandardsIgnoreStart
-				(new DateTime('now'))->format( _x( 'M d, Y @ h:i A', 'Webhook created on date parsed by DateTime::format', 'woocommerce' ) )
+				(new DateTime('now'))->format(_x('M d, Y @ h:i A', 'Webhook created on date parsed by DateTime::format', 'woocommerce'))
 				// @codingStandardsIgnoreEnd
 			);
 		}
 
-		$webhook->set_name( $name );
+		$webhook->set_name($name);
 
-		if ( ! $webhook->get_user_id() ) {
-			$webhook->set_user_id( get_current_user_id() );
+		if (!$webhook->get_user_id()) {
+			$webhook->set_user_id(get_current_user_id());
 		}
 
 		// Status.
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$webhook->set_status( ! empty( $_POST['webhook_status'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_status'] ) ) : 'disabled' );
+		$webhook->set_status(!empty($_POST['webhook_status']) ? sanitize_text_field(wp_unslash($_POST['webhook_status'])) : 'disabled');
 
 		// Delivery URL.
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? esc_url_raw( wp_unslash( $_POST['webhook_delivery_url'] ) ) : '';
+		$delivery_url = !empty($_POST['webhook_delivery_url']) ? esc_url_raw(wp_unslash($_POST['webhook_delivery_url'])) : '';
 
-		if ( wc_is_valid_url( $delivery_url ) ) {
-			$webhook->set_delivery_url( $delivery_url );
+		if (wc_is_valid_url($delivery_url)) {
+			$webhook->set_delivery_url($delivery_url);
 		}
 
 		// Secret.
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$secret = ! empty( $_POST['webhook_secret'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_secret'] ) ) : wp_generate_password( 50, true, true );
-		$webhook->set_secret( $secret );
+		$secret = !empty($_POST['webhook_secret']) ? sanitize_text_field(wp_unslash($_POST['webhook_secret'])) : wp_generate_password(50, true, true);
+		$webhook->set_secret($secret);
 
 		// Topic.
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! empty( $_POST['webhook_topic'] ) ) {
+		if (!empty($_POST['webhook_topic'])) {
 			$resource = '';
 			$event    = '';
 
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			switch ( $_POST['webhook_topic'] ) {
+			switch ($_POST['webhook_topic']) {
 				case 'action':
 					$resource = 'action';
 					// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$event = ! empty( $_POST['webhook_action_event'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_action_event'] ) ) : '';
+					$event = !empty($_POST['webhook_action_event']) ? sanitize_text_field(wp_unslash($_POST['webhook_action_event'])) : '';
 					break;
 
 				default:
 					// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					list( $resource, $event ) = explode( '.', sanitize_text_field( wp_unslash( $_POST['webhook_topic'] ) ) );
+					list($resource, $event) = explode('.', sanitize_text_field(wp_unslash($_POST['webhook_topic'])));
 					break;
 			}
 
 			$topic = $resource . '.' . $event;
 
-			if ( wc_is_webhook_valid_topic( $topic ) ) {
-				$webhook->set_topic( $topic );
+			if (wc_is_webhook_valid_topic($topic)) {
+				$webhook->set_topic($topic);
 			} else {
-				$errors[] = __( 'Webhook topic unknown. Please select a valid topic.', 'woocommerce' );
+				$errors[] = __('Webhook topic unknown. Please select a valid topic.', 'woocommerce');
 			}
 		}
 
 		// API version.
 		$rest_api_versions = wc_get_webhook_rest_api_versions();
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$webhook->set_api_version( ! empty( $_POST['webhook_api_version'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_api_version'] ) ) : end( $rest_api_versions ) );
+		$webhook->set_api_version(!empty($_POST['webhook_api_version']) ? sanitize_text_field(wp_unslash($_POST['webhook_api_version'])) : end($rest_api_versions));
 
 		$webhook->save();
 
 		// Run actions.
-		do_action( 'woocommerce_webhook_options_save', $webhook->get_id() );
-		if ( $errors ) {
+		do_action('woocommerce_webhook_options_save', $webhook->get_id());
+		if ($errors) {
 			// Redirect to webhook edit page to avoid settings save actions.
-			wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( implode( '|', $errors ) ) ) );
+			wp_safe_redirect(admin_url('admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode(implode('|', $errors))));
 			exit();
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		} elseif ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $webhook->get_pending_delivery() ) {
+		} elseif (isset($_POST['webhook_status']) && 'active' === $_POST['webhook_status'] && $webhook->get_pending_delivery()) {
 			// Ping the webhook at the first time that is activated.
 			$result = $webhook->deliver_ping();
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				// Redirect to webhook edit page to avoid settings save actions.
-				wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( $result->get_error_message() ) ) );
+				wp_safe_redirect(admin_url('admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode($result->get_error_message())));
 				exit();
 			}
 		}
 
 		// Redirect to webhook edit page to avoid settings save actions.
-		wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&updated=1' ) );
+		wp_safe_redirect(admin_url('admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=' . $webhook->get_id() . '&updated=1'));
 		exit();
 	}
 
@@ -165,18 +165,18 @@ 
 	 *
 	 * @param array $webhooks List of webhooks IDs.
 	 */
-	public static function bulk_delete( $webhooks ) {
-		foreach ( $webhooks as $webhook_id ) {
-			$webhook = new WC_Webhook( (int) $webhook_id );
-			$webhook->delete( true );
+	public static function bulk_delete($webhooks) {
+		foreach ($webhooks as $webhook_id) {
+			$webhook = new WC_Webhook((int) $webhook_id);
+			$webhook->delete(true);
 		}
 
-		$qty = count( $webhooks );
+		$qty = count($webhooks);
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( wp_unslash( $_GET['status'] ) ) : '';
+		$status = isset($_GET['status']) ? '&status=' . sanitize_text_field(wp_unslash($_GET['status'])) : '';
 
 		// Redirect to webhooks page.
-		wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks' . $status . '&deleted=' . $qty ) );
+		wp_safe_redirect(admin_url('admin.php?page=wc-settings&tab=advanced&section=webhooks' . $status . '&deleted=' . $qty));
 		exit();
 	}
 
@@ -184,15 +184,15 @@ 
 	 * Delete webhook.
 	 */
 	private function delete() {
-		check_admin_referer( 'delete-webhook' );
+		check_admin_referer('delete-webhook');
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['delete'] ) ) {
+		if (isset($_GET['delete'])) {
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$webhook_id = absint( $_GET['delete'] );
+			$webhook_id = absint($_GET['delete']);
 
-			if ( $webhook_id ) {
-				$this->bulk_delete( array( $webhook_id ) );
+			if ($webhook_id) {
+				$this->bulk_delete(array($webhook_id));
 			}
 		}
 	}
@@ -201,16 +201,16 @@ 
 	 * Webhooks admin actions.
 	 */
 	public function actions() {
-		if ( $this->is_webhook_settings_page() ) {
+		if ($this->is_webhook_settings_page()) {
 			// Save.
 			// phpcs:ignore WordPress.Security.NonceVerification.Missing
-			if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) {
+			if (isset($_POST['save']) && isset($_POST['webhook_id'])) {
 				$this->save();
 			}
 
 			// Delete webhook.
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			if ( isset( $_GET['delete'] ) ) {
+			if (isset($_GET['delete'])) {
 				$this->delete();
 			}
 		}
@@ -224,10 +224,10 @@ 
 		$GLOBALS['hide_save_button'] = true;
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['edit-webhook'] ) ) {
+		if (isset($_GET['edit-webhook'])) {
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$webhook_id = absint( $_GET['edit-webhook'] );
-			$webhook    = new WC_Webhook( $webhook_id );
+			$webhook_id = absint($_GET['edit-webhook']);
+			$webhook    = new WC_Webhook($webhook_id);
 
 			include __DIR__ . '/settings/views/html-webhooks-edit.php';
 			return;
@@ -241,29 +241,29 @@ 
 	 */
 	public static function notices() {
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['deleted'] ) ) {
+		if (isset($_GET['deleted'])) {
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$deleted = absint( $_GET['deleted'] );
+			$deleted = absint($_GET['deleted']);
 
 			/* translators: %d: count */
-			WC_Admin_Settings::add_message( sprintf( _n( '%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) );
+			WC_Admin_Settings::add_message(sprintf(_n('%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce'), $deleted));
 		}
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['updated'] ) ) {
-			WC_Admin_Settings::add_message( __( 'Webhook updated successfully.', 'woocommerce' ) );
+		if (isset($_GET['updated'])) {
+			WC_Admin_Settings::add_message(__('Webhook updated successfully.', 'woocommerce'));
 		}
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['created'] ) ) {
-			WC_Admin_Settings::add_message( __( 'Webhook created successfully.', 'woocommerce' ) );
+		if (isset($_GET['created'])) {
+			WC_Admin_Settings::add_message(__('Webhook created successfully.', 'woocommerce'));
 		}
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['error'] ) ) {
+		if (isset($_GET['error'])) {
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			foreach ( explode( '|', sanitize_text_field( wp_unslash( $_GET['error'] ) ) ) as $message ) {
-				WC_Admin_Settings::add_error( trim( $message ) );
+			foreach (explode('|', sanitize_text_field(wp_unslash($_GET['error']))) as $message) {
+				WC_Admin_Settings::add_error(trim($message));
 			}
 		}
 	}
@@ -275,7 +275,7 @@ 
 		global $webhooks_table_list;
 
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( ! isset( $_GET['edit-webhook'] ) && $this->is_webhook_settings_page() ) {
+		if (!isset($_GET['edit-webhook']) && $this->is_webhook_settings_page()) {
 			$webhooks_table_list = new WC_Admin_Webhooks_Table_List();
 
 			// Add screen option.
@@ -295,14 +295,14 @@ 
 	private static function table_list_output() {
 		global $webhooks_table_list;
 
-		echo '<h2 class="wc-table-list-header">' . esc_html__( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0' ) ) . '" class="add-new-h2">' . esc_html__( 'Add webhook', 'woocommerce' ) . '</a></h2>';
+		echo '<h2 class="wc-table-list-header">' . esc_html__('Webhooks', 'woocommerce') . ' <a href="' . esc_url(admin_url('admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0')) . '" class="add-new-h2">' . esc_html__('Add webhook', 'woocommerce') . '</a></h2>';
 
 		// Get the webhooks count.
-		$data_store   = WC_Data_Store::load( 'webhook' );
+		$data_store   = WC_Data_Store::load('webhook');
 		$num_webhooks = $data_store->get_count_webhooks_by_status();
-		$count        = array_sum( $num_webhooks );
+		$count        = array_sum($num_webhooks);
 
-		if ( 0 < $count ) {
+		if (0 < $count) {
 			$webhooks_table_list->process_bulk_action();
 			$webhooks_table_list->prepare_items();
 
@@ -311,13 +311,13 @@ 
 			echo '<input type="hidden" name="section" value="webhooks" />';
 
 			$webhooks_table_list->views();
-			$webhooks_table_list->search_box( __( 'Search webhooks', 'woocommerce' ), 'webhook' );
+			$webhooks_table_list->search_box(__('Search webhooks', 'woocommerce'), 'webhook');
 			$webhooks_table_list->display();
 		} else {
 			echo '<div class="woocommerce-BlankState woocommerce-BlankState--webhooks">';
 			?>
-			<h2 class="woocommerce-BlankState-message"><?php esc_html_e( 'Webhooks are event notifications sent to URLs of your choice. They can be used to integrate with third-party services which support them.', 'woocommerce' ); ?></h2>
-			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0' ) ); ?>"><?php esc_html_e( 'Create a new webhook', 'woocommerce' ); ?></a>
+			<h2 class="woocommerce-BlankState-message"><?php esc_html_e('Webhooks are event notifications sent to URLs of your choice. They can be used to integrate with third-party services which support them.', 'woocommerce'); ?></h2>
+			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=advanced&section=webhooks&edit-webhook=0')); ?>"><?php esc_html_e('Create a new webhook', 'woocommerce'); ?></a>
 			<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions { display: none; }</style>
 			<?php
 		}
@@ -329,8 +329,8 @@ 
 	 * @deprecated 3.3.0
 	 * @param WC_Webhook $webhook Deprecated.
 	 */
-	public static function logs_output( $webhook = 'deprecated' ) {
-		wc_deprecated_function( 'WC_Admin_Webhooks::logs_output', '3.3' );
+	public static function logs_output($webhook = 'deprecated') {
+		wc_deprecated_function('WC_Admin_Webhooks::logs_output', '3.3');
 	}
 
 	/**
@@ -340,17 +340,17 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_topic_data( $webhook ) {
+	public static function get_topic_data($webhook) {
 		$topic    = $webhook->get_topic();
 		$event    = '';
 		$resource = '';
 
-		if ( $topic ) {
-			list( $resource, $event ) = explode( '.', $topic );
+		if ($topic) {
+			list($resource, $event) = explode('.', $topic);
 
-			if ( 'action' === $resource ) {
+			if ('action' === $resource) {
 				$topic = 'action';
-			} elseif ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ), true ) ) {
+			} elseif (!in_array($resource, array('coupon', 'customer', 'order', 'product'), true)) {
 				$topic = 'custom';
 			}
 		}
@@ -369,8 +369,8 @@ 
 	 * @param int        $total Deprecated.
 	 * @param WC_Webhook $webhook Deprecated.
 	 */
-	public static function get_logs_navigation( $total, $webhook ) {
-		wc_deprecated_function( 'WC_Admin_Webhooks::get_logs_navigation', '3.3' );
+	public static function get_logs_navigation($total, $webhook) {
+		wc_deprecated_function('WC_Admin_Webhooks::get_logs_navigation', '3.3');
 	}
 }
 

plugins/woocommerce/includes/admin/class-wc-admin-menus.php

Indentation +369 added lines, -369 removed lines

@@ -13,349 +13,349 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( class_exists( 'WC_Admin_Menus', false ) ) {
-	return new WC_Admin_Menus();
+    return new WC_Admin_Menus();
 }
 
 /**
  * WC_Admin_Menus Class.
  */
 class WC_Admin_Menus {
-	/**
-	 * @var Custom_Orders_List_Table
-	 */
-	private $orders_list_table;
-
-	/**
-	 * Hook in tabs.
-	 */
-	public function __construct() {
-		// Add menus.
-		add_action( 'admin_menu', array( $this, 'menu_highlight' ) );
-		add_action( 'admin_menu', array( $this, 'menu_order_count' ) );
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 9 );
-		add_action( 'admin_menu', array( $this, 'orders_menu' ), 9 );
-		add_action( 'admin_menu', array( $this, 'reports_menu' ), 20 );
-		add_action( 'admin_menu', array( $this, 'settings_menu' ), 50 );
-		add_action( 'admin_menu', array( $this, 'status_menu' ), 60 );
-
-		if ( apply_filters( 'woocommerce_show_addons_page', true ) ) {
-			add_action( 'admin_menu', array( $this, 'addons_menu' ), 70 );
-		}
-
-		add_filter( 'menu_order', array( $this, 'menu_order' ) );
-		add_filter( 'custom_menu_order', array( $this, 'custom_menu_order' ) );
-		add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 );
-
-		// Add endpoints custom URLs in Appearance > Menus > Pages.
-		add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
-
-		// Admin bar menus.
-		if ( apply_filters( 'woocommerce_show_admin_bar_visit_store', true ) ) {
-			add_action( 'admin_bar_menu', array( $this, 'admin_bar_menus' ), 31 );
-		}
-
-		// Handle saving settings earlier than load-{page} hook to avoid race conditions in conditional menus.
-		add_action( 'wp_loaded', array( $this, 'save_settings' ) );
-	}
-
-	/**
-	 * Add menu items.
-	 */
-	public function admin_menu() {
-		global $menu;
-
-		$woocommerce_icon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxwYXRoIGZpbGw9IiNhMmFhYjIiIGQ9Ik02MTIuMTkyIDQyNi4zMzZjMC02Ljg5Ni0zLjEzNi01MS42LTI4LTUxLjYtMzcuMzYgMC00Ni43MDQgNzIuMjU2LTQ2LjcwNCA4Mi42MjQgMCAzLjQwOCAzLjE1MiA1OC40OTYgMjguMDMyIDU4LjQ5NiAzNC4xOTItLjAzMiA0Ni42NzItNzIuMjg4IDQ2LjY3Mi04OS41MnptMjAyLjE5MiAwYzAtNi44OTYtMy4xNTItNTEuNi0yOC4wMzItNTEuNi0zNy4yOCAwLTQ2LjYwOCA3Mi4yNTYtNDYuNjA4IDgyLjYyNCAwIDMuNDA4IDMuMDcyIDU4LjQ5NiAyNy45NTIgNTguNDk2IDM0LjE5Mi0uMDMyIDQ2LjY4OC03Mi4yODggNDYuNjg4LTg5LjUyek0xNDEuMjk2Ljc2OGMtNjguMjI0IDAtMTIzLjUwNCA1NS40ODgtMTIzLjUwNCAxMjMuOTJ2NjUwLjcyYzAgNjguNDMyIDU1LjI5NiAxMjMuOTIgMTIzLjUwNCAxMjMuOTJoMzM5LjgwOGwxMjMuNTA0IDEyMy45MzZWODk5LjMyOGgyNzguMDQ4YzY4LjIyNCAwIDEyMy41Mi01NS40NzIgMTIzLjUyLTEyMy45MnYtNjUwLjcyYzAtNjguNDMyLTU1LjI5Ni0xMjMuOTItMTIzLjUyLTEyMy45MmgtNzQxLjM2em01MjYuODY0IDQyMi4xNmMwIDU1LjA4OC0zMS4wODggMTU0Ljg4LTEwMi42NCAxNTQuODgtNi4yMDggMC0xOC40OTYtMy42MTYtMjUuNDI0LTYuMDE2LTMyLjUxMi0xMS4xNjgtNTAuMTkyLTQ5LjY5Ni01Mi4zNTItNjYuMjU2IDAgMC0zLjA3Mi0xNy43OTItMy4wNzItNDAuNzUyIDAtMjIuOTkyIDMuMDcyLTQ1LjMyOCAzLjA3Mi00NS4zMjggMTUuNTUyLTc1LjcyOCA0My41NTItMTA2LjczNiA5Ni40NDgtMTA2LjczNiA1OS4wNzItLjAzMiA4My45NjggNTguNTI4IDgzLjk2OCAxMTAuMjA4ek00ODYuNDk2IDMwMi40YzAgMy4zOTItNDMuNTUyIDE0MS4xNjgtNDMuNTUyIDIxMy40MjR2NzUuNzEyYy0yLjU5MiAxMi4wOC00LjE2IDI0LjE0NC0yMS44MjQgMjQuMTQ0LTQ2LjYwOCAwLTg4Ljg4LTE1MS40NzItOTIuMDE2LTE2MS44NC02LjIwOCA2Ljg5Ni02Mi4yNCAxNjEuODQtOTYuNDQ4IDE2MS44NC0yNC44NjQgMC00My41NTItMTEzLjY0OC00Ni42MDgtMTIzLjkzNkMxNzYuNzA0IDQzNi42NzIgMTYwIDMzNC4yMjQgMTYwIDMyNy4zMjhjMC0yMC42NzIgMS4xNTItMzguNzM2IDI2LjA0OC0zOC43MzYgNi4yMDggMCAyMS42IDYuMDY0IDIzLjcxMiAxNy4xNjggMTEuNjQ4IDYyLjAzMiAxNi42ODggMTIwLjUxMiAyOS4xNjggMTg1Ljk2OCAxLjg1NiAyLjkyOCAxLjUwNCA3LjAwOCA0LjU2IDEwLjQzMiAzLjE1Mi0xMC4yODggNjYuOTI4LTE2OC43ODQgOTQuOTYtMTY4Ljc4NCAyMi41NDQgMCAzMC40IDQ0LjU5MiAzMy41MzYgNjEuODI0IDYuMjA4IDIwLjY1NiAxMy4wODggNTUuMjE2IDIyLjQxNiA4Mi43NTIgMC0xMy43NzYgMTIuNDgtMjAzLjEyIDY1LjM5Mi0yMDMuMTIgMTguNTkyLjAzMiAyNi43MDQgNi45MjggMjYuNzA0IDI3LjU2OHpNODcwLjMyIDQyMi45MjhjMCA1NS4wODgtMzEuMDg4IDE1NC44OC0xMDIuNjQgMTU0Ljg4LTYuMTkyIDAtMTguNDQ4LTMuNjE2LTI1LjQyNC02LjAxNi0zMi40MzItMTEuMTY4LTUwLjE3Ni00OS42OTYtNTIuMjg4LTY2LjI1NiAwIDAtMy44ODgtMTcuOTItMy44ODgtNDAuODk2czMuODg4LTQ1LjE4NCAzLjg4OC00NS4xODRjMTUuNTUyLTc1LjcyOCA0My40ODgtMTA2LjczNiA5Ni4zODQtMTA2LjczNiA1OS4xMDQtLjAzMiA4My45NjggNTguNTI4IDgzLjk2OCAxMTAuMjA4eiIvPjwvc3ZnPg==';
-
-		if ( self::can_view_woocommerce_menu_item() ) {
-			$menu[] = array( '', 'read', 'separator-woocommerce', '', 'wp-menu-separator woocommerce' ); // WPCS: override ok.
-		}
-
-		add_menu_page( __( 'WooCommerce', 'woocommerce' ), __( 'WooCommerce', 'woocommerce' ), 'edit_others_shop_orders', 'woocommerce', null, $woocommerce_icon, '55.5' );
-
-		add_submenu_page( 'edit.php?post_type=product', __( 'Attributes', 'woocommerce' ), __( 'Attributes', 'woocommerce' ), 'manage_product_terms', 'product_attributes', array( $this, 'attributes_page' ) );
-	}
-
-	/**
-	 * Add menu item.
-	 */
-	public function reports_menu() {
-		if ( self::can_view_woocommerce_menu_item() ) {
-			add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ), __( 'Reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) );
-		} else {
-			add_menu_page( __( 'Sales reports', 'woocommerce' ), __( 'Sales reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), 'dashicons-chart-bar', '55.6' );
-		}
-	}
-
-	/**
-	 * Add menu item.
-	 */
-	public function settings_menu() {
-		$settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ), 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) );
-
-		add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) );
-	}
-
-	/**
-	 * Check if the user can access the top-level WooCommerce item.
-	 */
-	public static function can_view_woocommerce_menu_item() {
-		return current_user_can( 'edit_others_shop_orders' );
-	}
-
-	/**
-	 * Loads gateways and shipping methods into memory for use within settings.
-	 */
-	public function settings_page_init() {
-		WC()->payment_gateways();
-		WC()->shipping();
-
-		// Include settings pages.
-		WC_Admin_Settings::get_settings_pages();
-
-		// Add any posted messages.
-		if ( ! empty( $_GET['wc_error'] ) ) { // WPCS: input var okay, CSRF ok.
-			WC_Admin_Settings::add_error( wp_kses_post( wp_unslash( $_GET['wc_error'] ) ) ); // WPCS: input var okay, CSRF ok.
-		}
-
-		if ( ! empty( $_GET['wc_message'] ) ) { // WPCS: input var okay, CSRF ok.
-			WC_Admin_Settings::add_message( wp_kses_post( wp_unslash( $_GET['wc_message'] ) ) ); // WPCS: input var okay, CSRF ok.
-		}
-
-		do_action( 'woocommerce_settings_page_init' );
-	}
-
-	/**
-	 * Handle saving of settings.
-	 *
-	 * @return void
-	 */
-	public function save_settings() {
-		global $current_tab, $current_section;
-
-		// We should only save on the settings page.
-		if ( ! is_admin() || ! isset( $_GET['page'] ) || 'wc-settings' !== $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return;
-		}
-
-		// Include settings pages.
-		WC_Admin_Settings::get_settings_pages();
-
-		// Get current tab/section.
-		$current_tab     = empty( $_GET['tab'] ) ? 'general' : sanitize_title( wp_unslash( $_GET['tab'] ) ); // WPCS: input var okay, CSRF ok.
-		$current_section = empty( $_REQUEST['section'] ) ? '' : sanitize_title( wp_unslash( $_REQUEST['section'] ) ); // WPCS: input var okay, CSRF ok.
-
-		// Save settings if data has been posted.
-		if ( '' !== $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}_{$current_section}", ! empty( $_POST['save'] ) ) ) { // WPCS: input var okay, CSRF ok.
-			WC_Admin_Settings::save();
-		} elseif ( '' === $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}", ! empty( $_POST['save'] ) ) ) { // WPCS: input var okay, CSRF ok.
-			WC_Admin_Settings::save();
-		}
-	}
-
-	/**
-	 * Add menu item.
-	 */
-	public function status_menu() {
-		add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ), __( 'Status', 'woocommerce' ), 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) );
-	}
-
-	/**
-	 * Addons menu item.
-	 */
-	public function addons_menu() {
-		$count_html = WC_Helper_Updater::get_updates_count_html();
-		/* translators: %s: extensions count */
-		$menu_title = sprintf( __( 'Extensions %s', 'woocommerce' ), $count_html );
-		add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ), $menu_title, 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) );
-	}
-
-	/**
-	 * Highlights the correct top level admin menu item for post type add screens.
-	 */
-	public function menu_highlight() {
-		global $parent_file, $submenu_file, $post_type;
-
-		switch ( $post_type ) {
-			case 'shop_order':
-			case 'shop_coupon':
-				$parent_file = 'woocommerce'; // WPCS: override ok.
-				break;
-			case 'product':
-				$screen = get_current_screen();
-				if ( $screen && taxonomy_is_product_attribute( $screen->taxonomy ) ) {
-					$submenu_file = 'product_attributes'; // WPCS: override ok.
-					$parent_file  = 'edit.php?post_type=product'; // WPCS: override ok.
-				}
-				break;
-		}
-	}
-
-	/**
-	 * Adds the order processing count to the menu.
-	 */
-	public function menu_order_count() {
-		global $submenu;
-
-		if ( isset( $submenu['woocommerce'] ) ) {
-			// Remove 'WooCommerce' sub menu item.
-			unset( $submenu['woocommerce'][0] );
-
-			// Add count if user has access.
-			if ( apply_filters( 'woocommerce_include_processing_order_count_in_menu', true ) && current_user_can( 'edit_others_shop_orders' ) ) {
-				$order_count = apply_filters( 'woocommerce_menu_order_count', wc_processing_order_count() );
-
-				if ( $order_count ) {
-					foreach ( $submenu['woocommerce'] as $key => $menu_item ) {
-						if ( 0 === strpos( $menu_item[0], _x( 'Orders', 'Admin menu name', 'woocommerce' ) ) ) {
-							$submenu['woocommerce'][ $key ][0] .= ' <span class="awaiting-mod update-plugins count-' . esc_attr( $order_count ) . '"><span class="processing-count">' . number_format_i18n( $order_count ) . '</span></span>'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-							break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Reorder the WC menu items in admin.
-	 *
-	 * @param int $menu_order Menu order.
-	 * @return array
-	 */
-	public function menu_order( $menu_order ) {
-		// Initialize our custom order array.
-		$woocommerce_menu_order = array();
-
-		// Get the index of our custom separator.
-		$woocommerce_separator = array_search( 'separator-woocommerce', $menu_order, true );
-
-		// Get index of product menu.
-		$woocommerce_product = array_search( 'edit.php?post_type=product', $menu_order, true );
-
-		// Loop through menu order and do some rearranging.
-		foreach ( $menu_order as $index => $item ) {
-
-			if ( 'woocommerce' === $item ) {
-				$woocommerce_menu_order[] = 'separator-woocommerce';
-				$woocommerce_menu_order[] = $item;
-				$woocommerce_menu_order[] = 'edit.php?post_type=product';
-				unset( $menu_order[ $woocommerce_separator ] );
-				unset( $menu_order[ $woocommerce_product ] );
-			} elseif ( ! in_array( $item, array( 'separator-woocommerce' ), true ) ) {
-				$woocommerce_menu_order[] = $item;
-			}
-		}
-
-		// Return order.
-		return $woocommerce_menu_order;
-	}
-
-	/**
-	 * Custom menu order.
-	 *
-	 * @param bool $enabled Whether custom menu ordering is already enabled.
-	 * @return bool
-	 */
-	public function custom_menu_order( $enabled ) {
-		return $enabled || self::can_view_woocommerce_menu_item();
-	}
-
-	/**
-	 * Validate screen options on update.
-	 *
-	 * @param bool|int $status Screen option value. Default false to skip.
-	 * @param string   $option The option name.
-	 * @param int      $value  The number of rows to use.
-	 */
-	public function set_screen_option( $status, $option, $value ) {
-		if ( in_array( $option, array( 'woocommerce_keys_per_page', 'woocommerce_webhooks_per_page' ), true ) ) {
-			return $value;
-		}
-
-		return $status;
-	}
-
-	/**
-	 * Init the reports page.
-	 */
-	public function reports_page() {
-		WC_Admin_Reports::output();
-	}
-
-	/**
-	 * Init the settings page.
-	 */
-	public function settings_page() {
-		WC_Admin_Settings::output();
-	}
-
-	/**
-	 * Init the attributes page.
-	 */
-	public function attributes_page() {
-		WC_Admin_Attributes::output();
-	}
-
-	/**
-	 * Init the status page.
-	 */
-	public function status_page() {
-		WC_Admin_Status::output();
-	}
-
-	/**
-	 * Init the addons page.
-	 */
-	public function addons_page() {
-		WC_Admin_Addons::output();
-	}
-
-	/**
-	 * Link to the order admin list table from the main WooCommerce menu.
-	 *
-	 * @return void
-	 */
-	public function orders_menu(): void {
-		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
-			$this->orders_page_controller = new Custom_Orders_PageController();
-			$this->orders_page_controller->setup();
-		}
-	}
-
-	/**
-	 * Add custom nav meta box.
-	 *
-	 * Adapted from http://www.johnmorrisonline.com/how-to-add-a-fully-functional-custom-meta-box-to-wordpress-navigation-menus/.
-	 */
-	public function add_nav_menu_meta_boxes() {
-		add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
-	}
-
-	/**
-	 * Output menu links.
-	 */
-	public function nav_menu_links() {
-		// Get items from account menu.
-		$endpoints = wc_get_account_menu_items();
-
-		// Remove dashboard item.
-		if ( isset( $endpoints['dashboard'] ) ) {
-			unset( $endpoints['dashboard'] );
-		}
-
-		// Include missing lost password.
-		$endpoints['lost-password'] = __( 'Lost password', 'woocommerce' );
-
-		$endpoints = apply_filters( 'woocommerce_custom_nav_menu_items', $endpoints );
-
-		?>
+    /**
+     * @var Custom_Orders_List_Table
+     */
+    private $orders_list_table;
+
+    /**
+     * Hook in tabs.
+     */
+    public function __construct() {
+        // Add menus.
+        add_action( 'admin_menu', array( $this, 'menu_highlight' ) );
+        add_action( 'admin_menu', array( $this, 'menu_order_count' ) );
+        add_action( 'admin_menu', array( $this, 'admin_menu' ), 9 );
+        add_action( 'admin_menu', array( $this, 'orders_menu' ), 9 );
+        add_action( 'admin_menu', array( $this, 'reports_menu' ), 20 );
+        add_action( 'admin_menu', array( $this, 'settings_menu' ), 50 );
+        add_action( 'admin_menu', array( $this, 'status_menu' ), 60 );
+
+        if ( apply_filters( 'woocommerce_show_addons_page', true ) ) {
+            add_action( 'admin_menu', array( $this, 'addons_menu' ), 70 );
+        }
+
+        add_filter( 'menu_order', array( $this, 'menu_order' ) );
+        add_filter( 'custom_menu_order', array( $this, 'custom_menu_order' ) );
+        add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 );
+
+        // Add endpoints custom URLs in Appearance > Menus > Pages.
+        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+
+        // Admin bar menus.
+        if ( apply_filters( 'woocommerce_show_admin_bar_visit_store', true ) ) {
+            add_action( 'admin_bar_menu', array( $this, 'admin_bar_menus' ), 31 );
+        }
+
+        // Handle saving settings earlier than load-{page} hook to avoid race conditions in conditional menus.
+        add_action( 'wp_loaded', array( $this, 'save_settings' ) );
+    }
+
+    /**
+     * Add menu items.
+     */
+    public function admin_menu() {
+        global $menu;
+
+        $woocommerce_icon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxwYXRoIGZpbGw9IiNhMmFhYjIiIGQ9Ik02MTIuMTkyIDQyNi4zMzZjMC02Ljg5Ni0zLjEzNi01MS42LTI4LTUxLjYtMzcuMzYgMC00Ni43MDQgNzIuMjU2LTQ2LjcwNCA4Mi42MjQgMCAzLjQwOCAzLjE1MiA1OC40OTYgMjguMDMyIDU4LjQ5NiAzNC4xOTItLjAzMiA0Ni42NzItNzIuMjg4IDQ2LjY3Mi04OS41MnptMjAyLjE5MiAwYzAtNi44OTYtMy4xNTItNTEuNi0yOC4wMzItNTEuNi0zNy4yOCAwLTQ2LjYwOCA3Mi4yNTYtNDYuNjA4IDgyLjYyNCAwIDMuNDA4IDMuMDcyIDU4LjQ5NiAyNy45NTIgNTguNDk2IDM0LjE5Mi0uMDMyIDQ2LjY4OC03Mi4yODggNDYuNjg4LTg5LjUyek0xNDEuMjk2Ljc2OGMtNjguMjI0IDAtMTIzLjUwNCA1NS40ODgtMTIzLjUwNCAxMjMuOTJ2NjUwLjcyYzAgNjguNDMyIDU1LjI5NiAxMjMuOTIgMTIzLjUwNCAxMjMuOTJoMzM5LjgwOGwxMjMuNTA0IDEyMy45MzZWODk5LjMyOGgyNzguMDQ4YzY4LjIyNCAwIDEyMy41Mi01NS40NzIgMTIzLjUyLTEyMy45MnYtNjUwLjcyYzAtNjguNDMyLTU1LjI5Ni0xMjMuOTItMTIzLjUyLTEyMy45MmgtNzQxLjM2em01MjYuODY0IDQyMi4xNmMwIDU1LjA4OC0zMS4wODggMTU0Ljg4LTEwMi42NCAxNTQuODgtNi4yMDggMC0xOC40OTYtMy42MTYtMjUuNDI0LTYuMDE2LTMyLjUxMi0xMS4xNjgtNTAuMTkyLTQ5LjY5Ni01Mi4zNTItNjYuMjU2IDAgMC0zLjA3Mi0xNy43OTItMy4wNzItNDAuNzUyIDAtMjIuOTkyIDMuMDcyLTQ1LjMyOCAzLjA3Mi00NS4zMjggMTUuNTUyLTc1LjcyOCA0My41NTItMTA2LjczNiA5Ni40NDgtMTA2LjczNiA1OS4wNzItLjAzMiA4My45NjggNTguNTI4IDgzLjk2OCAxMTAuMjA4ek00ODYuNDk2IDMwMi40YzAgMy4zOTItNDMuNTUyIDE0MS4xNjgtNDMuNTUyIDIxMy40MjR2NzUuNzEyYy0yLjU5MiAxMi4wOC00LjE2IDI0LjE0NC0yMS44MjQgMjQuMTQ0LTQ2LjYwOCAwLTg4Ljg4LTE1MS40NzItOTIuMDE2LTE2MS44NC02LjIwOCA2Ljg5Ni02Mi4yNCAxNjEuODQtOTYuNDQ4IDE2MS44NC0yNC44NjQgMC00My41NTItMTEzLjY0OC00Ni42MDgtMTIzLjkzNkMxNzYuNzA0IDQzNi42NzIgMTYwIDMzNC4yMjQgMTYwIDMyNy4zMjhjMC0yMC42NzIgMS4xNTItMzguNzM2IDI2LjA0OC0zOC43MzYgNi4yMDggMCAyMS42IDYuMDY0IDIzLjcxMiAxNy4xNjggMTEuNjQ4IDYyLjAzMiAxNi42ODggMTIwLjUxMiAyOS4xNjggMTg1Ljk2OCAxLjg1NiAyLjkyOCAxLjUwNCA3LjAwOCA0LjU2IDEwLjQzMiAzLjE1Mi0xMC4yODggNjYuOTI4LTE2OC43ODQgOTQuOTYtMTY4Ljc4NCAyMi41NDQgMCAzMC40IDQ0LjU5MiAzMy41MzYgNjEuODI0IDYuMjA4IDIwLjY1NiAxMy4wODggNTUuMjE2IDIyLjQxNiA4Mi43NTIgMC0xMy43NzYgMTIuNDgtMjAzLjEyIDY1LjM5Mi0yMDMuMTIgMTguNTkyLjAzMiAyNi43MDQgNi45MjggMjYuNzA0IDI3LjU2OHpNODcwLjMyIDQyMi45MjhjMCA1NS4wODgtMzEuMDg4IDE1NC44OC0xMDIuNjQgMTU0Ljg4LTYuMTkyIDAtMTguNDQ4LTMuNjE2LTI1LjQyNC02LjAxNi0zMi40MzItMTEuMTY4LTUwLjE3Ni00OS42OTYtNTIuMjg4LTY2LjI1NiAwIDAtMy44ODgtMTcuOTItMy44ODgtNDAuODk2czMuODg4LTQ1LjE4NCAzLjg4OC00NS4xODRjMTUuNTUyLTc1LjcyOCA0My40ODgtMTA2LjczNiA5Ni4zODQtMTA2LjczNiA1OS4xMDQtLjAzMiA4My45NjggNTguNTI4IDgzLjk2OCAxMTAuMjA4eiIvPjwvc3ZnPg==';
+
+        if ( self::can_view_woocommerce_menu_item() ) {
+            $menu[] = array( '', 'read', 'separator-woocommerce', '', 'wp-menu-separator woocommerce' ); // WPCS: override ok.
+        }
+
+        add_menu_page( __( 'WooCommerce', 'woocommerce' ), __( 'WooCommerce', 'woocommerce' ), 'edit_others_shop_orders', 'woocommerce', null, $woocommerce_icon, '55.5' );
+
+        add_submenu_page( 'edit.php?post_type=product', __( 'Attributes', 'woocommerce' ), __( 'Attributes', 'woocommerce' ), 'manage_product_terms', 'product_attributes', array( $this, 'attributes_page' ) );
+    }
+
+    /**
+     * Add menu item.
+     */
+    public function reports_menu() {
+        if ( self::can_view_woocommerce_menu_item() ) {
+            add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ), __( 'Reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) );
+        } else {
+            add_menu_page( __( 'Sales reports', 'woocommerce' ), __( 'Sales reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), 'dashicons-chart-bar', '55.6' );
+        }
+    }
+
+    /**
+     * Add menu item.
+     */
+    public function settings_menu() {
+        $settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ), 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) );
+
+        add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) );
+    }
+
+    /**
+     * Check if the user can access the top-level WooCommerce item.
+     */
+    public static function can_view_woocommerce_menu_item() {
+        return current_user_can( 'edit_others_shop_orders' );
+    }
+
+    /**
+     * Loads gateways and shipping methods into memory for use within settings.
+     */
+    public function settings_page_init() {
+        WC()->payment_gateways();
+        WC()->shipping();
+
+        // Include settings pages.
+        WC_Admin_Settings::get_settings_pages();
+
+        // Add any posted messages.
+        if ( ! empty( $_GET['wc_error'] ) ) { // WPCS: input var okay, CSRF ok.
+            WC_Admin_Settings::add_error( wp_kses_post( wp_unslash( $_GET['wc_error'] ) ) ); // WPCS: input var okay, CSRF ok.
+        }
+
+        if ( ! empty( $_GET['wc_message'] ) ) { // WPCS: input var okay, CSRF ok.
+            WC_Admin_Settings::add_message( wp_kses_post( wp_unslash( $_GET['wc_message'] ) ) ); // WPCS: input var okay, CSRF ok.
+        }
+
+        do_action( 'woocommerce_settings_page_init' );
+    }
+
+    /**
+     * Handle saving of settings.
+     *
+     * @return void
+     */
+    public function save_settings() {
+        global $current_tab, $current_section;
+
+        // We should only save on the settings page.
+        if ( ! is_admin() || ! isset( $_GET['page'] ) || 'wc-settings' !== $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return;
+        }
+
+        // Include settings pages.
+        WC_Admin_Settings::get_settings_pages();
+
+        // Get current tab/section.
+        $current_tab     = empty( $_GET['tab'] ) ? 'general' : sanitize_title( wp_unslash( $_GET['tab'] ) ); // WPCS: input var okay, CSRF ok.
+        $current_section = empty( $_REQUEST['section'] ) ? '' : sanitize_title( wp_unslash( $_REQUEST['section'] ) ); // WPCS: input var okay, CSRF ok.
+
+        // Save settings if data has been posted.
+        if ( '' !== $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}_{$current_section}", ! empty( $_POST['save'] ) ) ) { // WPCS: input var okay, CSRF ok.
+            WC_Admin_Settings::save();
+        } elseif ( '' === $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}", ! empty( $_POST['save'] ) ) ) { // WPCS: input var okay, CSRF ok.
+            WC_Admin_Settings::save();
+        }
+    }
+
+    /**
+     * Add menu item.
+     */
+    public function status_menu() {
+        add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ), __( 'Status', 'woocommerce' ), 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) );
+    }
+
+    /**
+     * Addons menu item.
+     */
+    public function addons_menu() {
+        $count_html = WC_Helper_Updater::get_updates_count_html();
+        /* translators: %s: extensions count */
+        $menu_title = sprintf( __( 'Extensions %s', 'woocommerce' ), $count_html );
+        add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ), $menu_title, 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) );
+    }
+
+    /**
+     * Highlights the correct top level admin menu item for post type add screens.
+     */
+    public function menu_highlight() {
+        global $parent_file, $submenu_file, $post_type;
+
+        switch ( $post_type ) {
+            case 'shop_order':
+            case 'shop_coupon':
+                $parent_file = 'woocommerce'; // WPCS: override ok.
+                break;
+            case 'product':
+                $screen = get_current_screen();
+                if ( $screen && taxonomy_is_product_attribute( $screen->taxonomy ) ) {
+                    $submenu_file = 'product_attributes'; // WPCS: override ok.
+                    $parent_file  = 'edit.php?post_type=product'; // WPCS: override ok.
+                }
+                break;
+        }
+    }
+
+    /**
+     * Adds the order processing count to the menu.
+     */
+    public function menu_order_count() {
+        global $submenu;
+
+        if ( isset( $submenu['woocommerce'] ) ) {
+            // Remove 'WooCommerce' sub menu item.
+            unset( $submenu['woocommerce'][0] );
+
+            // Add count if user has access.
+            if ( apply_filters( 'woocommerce_include_processing_order_count_in_menu', true ) && current_user_can( 'edit_others_shop_orders' ) ) {
+                $order_count = apply_filters( 'woocommerce_menu_order_count', wc_processing_order_count() );
+
+                if ( $order_count ) {
+                    foreach ( $submenu['woocommerce'] as $key => $menu_item ) {
+                        if ( 0 === strpos( $menu_item[0], _x( 'Orders', 'Admin menu name', 'woocommerce' ) ) ) {
+                            $submenu['woocommerce'][ $key ][0] .= ' <span class="awaiting-mod update-plugins count-' . esc_attr( $order_count ) . '"><span class="processing-count">' . number_format_i18n( $order_count ) . '</span></span>'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Reorder the WC menu items in admin.
+     *
+     * @param int $menu_order Menu order.
+     * @return array
+     */
+    public function menu_order( $menu_order ) {
+        // Initialize our custom order array.
+        $woocommerce_menu_order = array();
+
+        // Get the index of our custom separator.
+        $woocommerce_separator = array_search( 'separator-woocommerce', $menu_order, true );
+
+        // Get index of product menu.
+        $woocommerce_product = array_search( 'edit.php?post_type=product', $menu_order, true );
+
+        // Loop through menu order and do some rearranging.
+        foreach ( $menu_order as $index => $item ) {
+
+            if ( 'woocommerce' === $item ) {
+                $woocommerce_menu_order[] = 'separator-woocommerce';
+                $woocommerce_menu_order[] = $item;
+                $woocommerce_menu_order[] = 'edit.php?post_type=product';
+                unset( $menu_order[ $woocommerce_separator ] );
+                unset( $menu_order[ $woocommerce_product ] );
+            } elseif ( ! in_array( $item, array( 'separator-woocommerce' ), true ) ) {
+                $woocommerce_menu_order[] = $item;
+            }
+        }
+
+        // Return order.
+        return $woocommerce_menu_order;
+    }
+
+    /**
+     * Custom menu order.
+     *
+     * @param bool $enabled Whether custom menu ordering is already enabled.
+     * @return bool
+     */
+    public function custom_menu_order( $enabled ) {
+        return $enabled || self::can_view_woocommerce_menu_item();
+    }
+
+    /**
+     * Validate screen options on update.
+     *
+     * @param bool|int $status Screen option value. Default false to skip.
+     * @param string   $option The option name.
+     * @param int      $value  The number of rows to use.
+     */
+    public function set_screen_option( $status, $option, $value ) {
+        if ( in_array( $option, array( 'woocommerce_keys_per_page', 'woocommerce_webhooks_per_page' ), true ) ) {
+            return $value;
+        }
+
+        return $status;
+    }
+
+    /**
+     * Init the reports page.
+     */
+    public function reports_page() {
+        WC_Admin_Reports::output();
+    }
+
+    /**
+     * Init the settings page.
+     */
+    public function settings_page() {
+        WC_Admin_Settings::output();
+    }
+
+    /**
+     * Init the attributes page.
+     */
+    public function attributes_page() {
+        WC_Admin_Attributes::output();
+    }
+
+    /**
+     * Init the status page.
+     */
+    public function status_page() {
+        WC_Admin_Status::output();
+    }
+
+    /**
+     * Init the addons page.
+     */
+    public function addons_page() {
+        WC_Admin_Addons::output();
+    }
+
+    /**
+     * Link to the order admin list table from the main WooCommerce menu.
+     *
+     * @return void
+     */
+    public function orders_menu(): void {
+        if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+            $this->orders_page_controller = new Custom_Orders_PageController();
+            $this->orders_page_controller->setup();
+        }
+    }
+
+    /**
+     * Add custom nav meta box.
+     *
+     * Adapted from http://www.johnmorrisonline.com/how-to-add-a-fully-functional-custom-meta-box-to-wordpress-navigation-menus/.
+     */
+    public function add_nav_menu_meta_boxes() {
+        add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
+    }
+
+    /**
+     * Output menu links.
+     */
+    public function nav_menu_links() {
+        // Get items from account menu.
+        $endpoints = wc_get_account_menu_items();
+
+        // Remove dashboard item.
+        if ( isset( $endpoints['dashboard'] ) ) {
+            unset( $endpoints['dashboard'] );
+        }
+
+        // Include missing lost password.
+        $endpoints['lost-password'] = __( 'Lost password', 'woocommerce' );
+
+        $endpoints = apply_filters( 'woocommerce_custom_nav_menu_items', $endpoints );
+
+        ?>
 		<div id="posttype-woocommerce-endpoints" class="posttypediv">
 			<div id="tabs-panel-woocommerce-endpoints" class="tabs-panel tabs-panel-active">
 				<ul id="woocommerce-endpoints-checklist" class="categorychecklist form-no-clear">
 					<?php
-					$i = -1;
-					foreach ( $endpoints as $key => $value ) :
-						?>
+                    $i = -1;
+                    foreach ( $endpoints as $key => $value ) :
+                        ?>
 						<li>
 							<label class="menu-item-title">
 								<input type="checkbox" class="menu-item-checkbox" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-object-id]" value="<?php echo esc_attr( $i ); ?>" /> <?php echo esc_html( $value ); ?>
@@ -366,9 +366,9 @@ 
 							<input type="hidden" class="menu-item-classes" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-classes]" />
 						</li>
 						<?php
-						$i--;
-					endforeach;
-					?>
+                        $i--;
+                    endforeach;
+                    ?>
 				</ul>
 			</div>
 			<p class="button-controls">
@@ -382,39 +382,39 @@ 
 			</p>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Add the "Visit Store" link in admin bar main menu.
-	 *
-	 * @since 2.4.0
-	 * @param WP_Admin_Bar $wp_admin_bar Admin bar instance.
-	 */
-	public function admin_bar_menus( $wp_admin_bar ) {
-		if ( ! is_admin() || ! is_admin_bar_showing() ) {
-			return;
-		}
-
-		// Show only when the user is a member of this site, or they're a super admin.
-		if ( ! is_user_member_of_blog() && ! is_super_admin() ) {
-			return;
-		}
-
-		// Don't display when shop page is the same of the page on front.
-		if ( intval( get_option( 'page_on_front' ) ) === wc_get_page_id( 'shop' ) ) {
-			return;
-		}
-
-		// Add an option to visit the store.
-		$wp_admin_bar->add_node(
-			array(
-				'parent' => 'site-name',
-				'id'     => 'view-store',
-				'title'  => __( 'Visit Store', 'woocommerce' ),
-				'href'   => wc_get_page_permalink( 'shop' ),
-			)
-		);
-	}
+    }
+
+    /**
+     * Add the "Visit Store" link in admin bar main menu.
+     *
+     * @since 2.4.0
+     * @param WP_Admin_Bar $wp_admin_bar Admin bar instance.
+     */
+    public function admin_bar_menus( $wp_admin_bar ) {
+        if ( ! is_admin() || ! is_admin_bar_showing() ) {
+            return;
+        }
+
+        // Show only when the user is a member of this site, or they're a super admin.
+        if ( ! is_user_member_of_blog() && ! is_super_admin() ) {
+            return;
+        }
+
+        // Don't display when shop page is the same of the page on front.
+        if ( intval( get_option( 'page_on_front' ) ) === wc_get_page_id( 'shop' ) ) {
+            return;
+        }
+
+        // Add an option to visit the store.
+        $wp_admin_bar->add_node(
+            array(
+                'parent' => 'site-name',
+                'id'     => 'view-store',
+                'title'  => __( 'Visit Store', 'woocommerce' ),
+                'href'   => wc_get_page_permalink( 'shop' ),
+            )
+        );
+    }
 
 }
 

Spacing +83 added lines, -83 removed lines

@@ -10,9 +10,9 @@ 
 use Automattic\WooCommerce\Internal\Admin\Orders\PageController as Custom_Orders_PageController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( class_exists( 'WC_Admin_Menus', false ) ) {
+if (class_exists('WC_Admin_Menus', false)) {
 	return new WC_Admin_Menus();
 }
 
@@ -30,32 +30,32 @@ 
 	 */
 	public function __construct() {
 		// Add menus.
-		add_action( 'admin_menu', array( $this, 'menu_highlight' ) );
-		add_action( 'admin_menu', array( $this, 'menu_order_count' ) );
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 9 );
-		add_action( 'admin_menu', array( $this, 'orders_menu' ), 9 );
-		add_action( 'admin_menu', array( $this, 'reports_menu' ), 20 );
-		add_action( 'admin_menu', array( $this, 'settings_menu' ), 50 );
-		add_action( 'admin_menu', array( $this, 'status_menu' ), 60 );
-
-		if ( apply_filters( 'woocommerce_show_addons_page', true ) ) {
-			add_action( 'admin_menu', array( $this, 'addons_menu' ), 70 );
+		add_action('admin_menu', array($this, 'menu_highlight'));
+		add_action('admin_menu', array($this, 'menu_order_count'));
+		add_action('admin_menu', array($this, 'admin_menu'), 9);
+		add_action('admin_menu', array($this, 'orders_menu'), 9);
+		add_action('admin_menu', array($this, 'reports_menu'), 20);
+		add_action('admin_menu', array($this, 'settings_menu'), 50);
+		add_action('admin_menu', array($this, 'status_menu'), 60);
+
+		if (apply_filters('woocommerce_show_addons_page', true)) {
+			add_action('admin_menu', array($this, 'addons_menu'), 70);
 		}
 
-		add_filter( 'menu_order', array( $this, 'menu_order' ) );
-		add_filter( 'custom_menu_order', array( $this, 'custom_menu_order' ) );
-		add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 );
+		add_filter('menu_order', array($this, 'menu_order'));
+		add_filter('custom_menu_order', array($this, 'custom_menu_order'));
+		add_filter('set-screen-option', array($this, 'set_screen_option'), 10, 3);
 
 		// Add endpoints custom URLs in Appearance > Menus > Pages.
-		add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+		add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
 
 		// Admin bar menus.
-		if ( apply_filters( 'woocommerce_show_admin_bar_visit_store', true ) ) {
-			add_action( 'admin_bar_menu', array( $this, 'admin_bar_menus' ), 31 );
+		if (apply_filters('woocommerce_show_admin_bar_visit_store', true)) {
+			add_action('admin_bar_menu', array($this, 'admin_bar_menus'), 31);
 		}
 
 		// Handle saving settings earlier than load-{page} hook to avoid race conditions in conditional menus.
-		add_action( 'wp_loaded', array( $this, 'save_settings' ) );
+		add_action('wp_loaded', array($this, 'save_settings'));
 	}
 
 	/**
@@ -66,23 +66,23 @@ 
 
 		$woocommerce_icon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxwYXRoIGZpbGw9IiNhMmFhYjIiIGQ9Ik02MTIuMTkyIDQyNi4zMzZjMC02Ljg5Ni0zLjEzNi01MS42LTI4LTUxLjYtMzcuMzYgMC00Ni43MDQgNzIuMjU2LTQ2LjcwNCA4Mi42MjQgMCAzLjQwOCAzLjE1MiA1OC40OTYgMjguMDMyIDU4LjQ5NiAzNC4xOTItLjAzMiA0Ni42NzItNzIuMjg4IDQ2LjY3Mi04OS41MnptMjAyLjE5MiAwYzAtNi44OTYtMy4xNTItNTEuNi0yOC4wMzItNTEuNi0zNy4yOCAwLTQ2LjYwOCA3Mi4yNTYtNDYuNjA4IDgyLjYyNCAwIDMuNDA4IDMuMDcyIDU4LjQ5NiAyNy45NTIgNTguNDk2IDM0LjE5Mi0uMDMyIDQ2LjY4OC03Mi4yODggNDYuNjg4LTg5LjUyek0xNDEuMjk2Ljc2OGMtNjguMjI0IDAtMTIzLjUwNCA1NS40ODgtMTIzLjUwNCAxMjMuOTJ2NjUwLjcyYzAgNjguNDMyIDU1LjI5NiAxMjMuOTIgMTIzLjUwNCAxMjMuOTJoMzM5LjgwOGwxMjMuNTA0IDEyMy45MzZWODk5LjMyOGgyNzguMDQ4YzY4LjIyNCAwIDEyMy41Mi01NS40NzIgMTIzLjUyLTEyMy45MnYtNjUwLjcyYzAtNjguNDMyLTU1LjI5Ni0xMjMuOTItMTIzLjUyLTEyMy45MmgtNzQxLjM2em01MjYuODY0IDQyMi4xNmMwIDU1LjA4OC0zMS4wODggMTU0Ljg4LTEwMi42NCAxNTQuODgtNi4yMDggMC0xOC40OTYtMy42MTYtMjUuNDI0LTYuMDE2LTMyLjUxMi0xMS4xNjgtNTAuMTkyLTQ5LjY5Ni01Mi4zNTItNjYuMjU2IDAgMC0zLjA3Mi0xNy43OTItMy4wNzItNDAuNzUyIDAtMjIuOTkyIDMuMDcyLTQ1LjMyOCAzLjA3Mi00NS4zMjggMTUuNTUyLTc1LjcyOCA0My41NTItMTA2LjczNiA5Ni40NDgtMTA2LjczNiA1OS4wNzItLjAzMiA4My45NjggNTguNTI4IDgzLjk2OCAxMTAuMjA4ek00ODYuNDk2IDMwMi40YzAgMy4zOTItNDMuNTUyIDE0MS4xNjgtNDMuNTUyIDIxMy40MjR2NzUuNzEyYy0yLjU5MiAxMi4wOC00LjE2IDI0LjE0NC0yMS44MjQgMjQuMTQ0LTQ2LjYwOCAwLTg4Ljg4LTE1MS40NzItOTIuMDE2LTE2MS44NC02LjIwOCA2Ljg5Ni02Mi4yNCAxNjEuODQtOTYuNDQ4IDE2MS44NC0yNC44NjQgMC00My41NTItMTEzLjY0OC00Ni42MDgtMTIzLjkzNkMxNzYuNzA0IDQzNi42NzIgMTYwIDMzNC4yMjQgMTYwIDMyNy4zMjhjMC0yMC42NzIgMS4xNTItMzguNzM2IDI2LjA0OC0zOC43MzYgNi4yMDggMCAyMS42IDYuMDY0IDIzLjcxMiAxNy4xNjggMTEuNjQ4IDYyLjAzMiAxNi42ODggMTIwLjUxMiAyOS4xNjggMTg1Ljk2OCAxLjg1NiAyLjkyOCAxLjUwNCA3LjAwOCA0LjU2IDEwLjQzMiAzLjE1Mi0xMC4yODggNjYuOTI4LTE2OC43ODQgOTQuOTYtMTY4Ljc4NCAyMi41NDQgMCAzMC40IDQ0LjU5MiAzMy41MzYgNjEuODI0IDYuMjA4IDIwLjY1NiAxMy4wODggNTUuMjE2IDIyLjQxNiA4Mi43NTIgMC0xMy43NzYgMTIuNDgtMjAzLjEyIDY1LjM5Mi0yMDMuMTIgMTguNTkyLjAzMiAyNi43MDQgNi45MjggMjYuNzA0IDI3LjU2OHpNODcwLjMyIDQyMi45MjhjMCA1NS4wODgtMzEuMDg4IDE1NC44OC0xMDIuNjQgMTU0Ljg4LTYuMTkyIDAtMTguNDQ4LTMuNjE2LTI1LjQyNC02LjAxNi0zMi40MzItMTEuMTY4LTUwLjE3Ni00OS42OTYtNTIuMjg4LTY2LjI1NiAwIDAtMy44ODgtMTcuOTItMy44ODgtNDAuODk2czMuODg4LTQ1LjE4NCAzLjg4OC00NS4xODRjMTUuNTUyLTc1LjcyOCA0My40ODgtMTA2LjczNiA5Ni4zODQtMTA2LjczNiA1OS4xMDQtLjAzMiA4My45NjggNTguNTI4IDgzLjk2OCAxMTAuMjA4eiIvPjwvc3ZnPg==';
 
-		if ( self::can_view_woocommerce_menu_item() ) {
-			$menu[] = array( '', 'read', 'separator-woocommerce', '', 'wp-menu-separator woocommerce' ); // WPCS: override ok.
+		if (self::can_view_woocommerce_menu_item()) {
+			$menu[] = array('', 'read', 'separator-woocommerce', '', 'wp-menu-separator woocommerce'); // WPCS: override ok.
 		}
 
-		add_menu_page( __( 'WooCommerce', 'woocommerce' ), __( 'WooCommerce', 'woocommerce' ), 'edit_others_shop_orders', 'woocommerce', null, $woocommerce_icon, '55.5' );
+		add_menu_page(__('WooCommerce', 'woocommerce'), __('WooCommerce', 'woocommerce'), 'edit_others_shop_orders', 'woocommerce', null, $woocommerce_icon, '55.5');
 
-		add_submenu_page( 'edit.php?post_type=product', __( 'Attributes', 'woocommerce' ), __( 'Attributes', 'woocommerce' ), 'manage_product_terms', 'product_attributes', array( $this, 'attributes_page' ) );
+		add_submenu_page('edit.php?post_type=product', __('Attributes', 'woocommerce'), __('Attributes', 'woocommerce'), 'manage_product_terms', 'product_attributes', array($this, 'attributes_page'));
 	}
 
 	/**
 	 * Add menu item.
 	 */
 	public function reports_menu() {
-		if ( self::can_view_woocommerce_menu_item() ) {
-			add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ), __( 'Reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) );
+		if (self::can_view_woocommerce_menu_item()) {
+			add_submenu_page('woocommerce', __('Reports', 'woocommerce'), __('Reports', 'woocommerce'), 'view_woocommerce_reports', 'wc-reports', array($this, 'reports_page'));
 		} else {
-			add_menu_page( __( 'Sales reports', 'woocommerce' ), __( 'Sales reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), 'dashicons-chart-bar', '55.6' );
+			add_menu_page(__('Sales reports', 'woocommerce'), __('Sales reports', 'woocommerce'), 'view_woocommerce_reports', 'wc-reports', array($this, 'reports_page'), 'dashicons-chart-bar', '55.6');
 		}
 	}
 
@@ -90,16 +90,16 @@ 
 	 * Add menu item.
 	 */
 	public function settings_menu() {
-		$settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ), 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) );
+		$settings_page = add_submenu_page('woocommerce', __('WooCommerce settings', 'woocommerce'), __('Settings', 'woocommerce'), 'manage_woocommerce', 'wc-settings', array($this, 'settings_page'));
 
-		add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) );
+		add_action('load-' . $settings_page, array($this, 'settings_page_init'));
 	}
 
 	/**
 	 * Check if the user can access the top-level WooCommerce item.
 	 */
 	public static function can_view_woocommerce_menu_item() {
-		return current_user_can( 'edit_others_shop_orders' );
+		return current_user_can('edit_others_shop_orders');
 	}
 
 	/**
@@ -113,15 +113,15 @@ 
 		WC_Admin_Settings::get_settings_pages();
 
 		// Add any posted messages.
-		if ( ! empty( $_GET['wc_error'] ) ) { // WPCS: input var okay, CSRF ok.
-			WC_Admin_Settings::add_error( wp_kses_post( wp_unslash( $_GET['wc_error'] ) ) ); // WPCS: input var okay, CSRF ok.
+		if (!empty($_GET['wc_error'])) { // WPCS: input var okay, CSRF ok.
+			WC_Admin_Settings::add_error(wp_kses_post(wp_unslash($_GET['wc_error']))); // WPCS: input var okay, CSRF ok.
 		}
 
-		if ( ! empty( $_GET['wc_message'] ) ) { // WPCS: input var okay, CSRF ok.
-			WC_Admin_Settings::add_message( wp_kses_post( wp_unslash( $_GET['wc_message'] ) ) ); // WPCS: input var okay, CSRF ok.
+		if (!empty($_GET['wc_message'])) { // WPCS: input var okay, CSRF ok.
+			WC_Admin_Settings::add_message(wp_kses_post(wp_unslash($_GET['wc_message']))); // WPCS: input var okay, CSRF ok.
 		}
 
-		do_action( 'woocommerce_settings_page_init' );
+		do_action('woocommerce_settings_page_init');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		global $current_tab, $current_section;
 
 		// We should only save on the settings page.
-		if ( ! is_admin() || ! isset( $_GET['page'] ) || 'wc-settings' !== $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if (!is_admin() || !isset($_GET['page']) || 'wc-settings' !== $_GET['page']) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return;
 		}
 
@@ -141,13 +141,13 @@ 
 		WC_Admin_Settings::get_settings_pages();
 
 		// Get current tab/section.
-		$current_tab     = empty( $_GET['tab'] ) ? 'general' : sanitize_title( wp_unslash( $_GET['tab'] ) ); // WPCS: input var okay, CSRF ok.
-		$current_section = empty( $_REQUEST['section'] ) ? '' : sanitize_title( wp_unslash( $_REQUEST['section'] ) ); // WPCS: input var okay, CSRF ok.
+		$current_tab     = empty($_GET['tab']) ? 'general' : sanitize_title(wp_unslash($_GET['tab'])); // WPCS: input var okay, CSRF ok.
+		$current_section = empty($_REQUEST['section']) ? '' : sanitize_title(wp_unslash($_REQUEST['section'])); // WPCS: input var okay, CSRF ok.
 
 		// Save settings if data has been posted.
-		if ( '' !== $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}_{$current_section}", ! empty( $_POST['save'] ) ) ) { // WPCS: input var okay, CSRF ok.
+		if ('' !== $current_section && apply_filters("woocommerce_save_settings_{$current_tab}_{$current_section}", !empty($_POST['save']))) { // WPCS: input var okay, CSRF ok.
 			WC_Admin_Settings::save();
-		} elseif ( '' === $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}", ! empty( $_POST['save'] ) ) ) { // WPCS: input var okay, CSRF ok.
+		} elseif ('' === $current_section && apply_filters("woocommerce_save_settings_{$current_tab}", !empty($_POST['save']))) { // WPCS: input var okay, CSRF ok.
 			WC_Admin_Settings::save();
 		}
 	}
@@ -156,7 +156,7 @@ 
 	 * Add menu item.
 	 */
 	public function status_menu() {
-		add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ), __( 'Status', 'woocommerce' ), 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) );
+		add_submenu_page('woocommerce', __('WooCommerce status', 'woocommerce'), __('Status', 'woocommerce'), 'manage_woocommerce', 'wc-status', array($this, 'status_page'));
 	}
 
 	/**
@@ -165,8 +165,8 @@ 
 	public function addons_menu() {
 		$count_html = WC_Helper_Updater::get_updates_count_html();
 		/* translators: %s: extensions count */
-		$menu_title = sprintf( __( 'Extensions %s', 'woocommerce' ), $count_html );
-		add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ), $menu_title, 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) );
+		$menu_title = sprintf(__('Extensions %s', 'woocommerce'), $count_html);
+		add_submenu_page('woocommerce', __('WooCommerce extensions', 'woocommerce'), $menu_title, 'manage_woocommerce', 'wc-addons', array($this, 'addons_page'));
 	}
 
 	/**
@@ -175,14 +175,14 @@ 
 	public function menu_highlight() {
 		global $parent_file, $submenu_file, $post_type;
 
-		switch ( $post_type ) {
+		switch ($post_type) {
 			case 'shop_order':
 			case 'shop_coupon':
 				$parent_file = 'woocommerce'; // WPCS: override ok.
 				break;
 			case 'product':
 				$screen = get_current_screen();
-				if ( $screen && taxonomy_is_product_attribute( $screen->taxonomy ) ) {
+				if ($screen && taxonomy_is_product_attribute($screen->taxonomy)) {
 					$submenu_file = 'product_attributes'; // WPCS: override ok.
 					$parent_file  = 'edit.php?post_type=product'; // WPCS: override ok.
 				}
@@ -196,18 +196,18 @@ 
 	public function menu_order_count() {
 		global $submenu;
 
-		if ( isset( $submenu['woocommerce'] ) ) {
+		if (isset($submenu['woocommerce'])) {
 			// Remove 'WooCommerce' sub menu item.
-			unset( $submenu['woocommerce'][0] );
+			unset($submenu['woocommerce'][0]);
 
 			// Add count if user has access.
-			if ( apply_filters( 'woocommerce_include_processing_order_count_in_menu', true ) && current_user_can( 'edit_others_shop_orders' ) ) {
-				$order_count = apply_filters( 'woocommerce_menu_order_count', wc_processing_order_count() );
+			if (apply_filters('woocommerce_include_processing_order_count_in_menu', true) && current_user_can('edit_others_shop_orders')) {
+				$order_count = apply_filters('woocommerce_menu_order_count', wc_processing_order_count());
 
-				if ( $order_count ) {
-					foreach ( $submenu['woocommerce'] as $key => $menu_item ) {
-						if ( 0 === strpos( $menu_item[0], _x( 'Orders', 'Admin menu name', 'woocommerce' ) ) ) {
-							$submenu['woocommerce'][ $key ][0] .= ' <span class="awaiting-mod update-plugins count-' . esc_attr( $order_count ) . '"><span class="processing-count">' . number_format_i18n( $order_count ) . '</span></span>'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+				if ($order_count) {
+					foreach ($submenu['woocommerce'] as $key => $menu_item) {
+						if (0 === strpos($menu_item[0], _x('Orders', 'Admin menu name', 'woocommerce'))) {
+							$submenu['woocommerce'][$key][0] .= ' <span class="awaiting-mod update-plugins count-' . esc_attr($order_count) . '"><span class="processing-count">' . number_format_i18n($order_count) . '</span></span>'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 							break;
 						}
 					}
@@ -222,26 +222,26 @@ 
 	 * @param int $menu_order Menu order.
 	 * @return array
 	 */
-	public function menu_order( $menu_order ) {
+	public function menu_order($menu_order) {
 		// Initialize our custom order array.
 		$woocommerce_menu_order = array();
 
 		// Get the index of our custom separator.
-		$woocommerce_separator = array_search( 'separator-woocommerce', $menu_order, true );
+		$woocommerce_separator = array_search('separator-woocommerce', $menu_order, true);
 
 		// Get index of product menu.
-		$woocommerce_product = array_search( 'edit.php?post_type=product', $menu_order, true );
+		$woocommerce_product = array_search('edit.php?post_type=product', $menu_order, true);
 
 		// Loop through menu order and do some rearranging.
-		foreach ( $menu_order as $index => $item ) {
+		foreach ($menu_order as $index => $item) {
 
-			if ( 'woocommerce' === $item ) {
+			if ('woocommerce' === $item) {
 				$woocommerce_menu_order[] = 'separator-woocommerce';
 				$woocommerce_menu_order[] = $item;
 				$woocommerce_menu_order[] = 'edit.php?post_type=product';
-				unset( $menu_order[ $woocommerce_separator ] );
-				unset( $menu_order[ $woocommerce_product ] );
-			} elseif ( ! in_array( $item, array( 'separator-woocommerce' ), true ) ) {
+				unset($menu_order[$woocommerce_separator]);
+				unset($menu_order[$woocommerce_product]);
+			} elseif (!in_array($item, array('separator-woocommerce'), true)) {
 				$woocommerce_menu_order[] = $item;
 			}
 		}
@@ -256,7 +256,7 @@ 
 	 * @param bool $enabled Whether custom menu ordering is already enabled.
 	 * @return bool
 	 */
-	public function custom_menu_order( $enabled ) {
+	public function custom_menu_order($enabled) {
 		return $enabled || self::can_view_woocommerce_menu_item();
 	}
 
@@ -267,8 +267,8 @@ 
 	 * @param string   $option The option name.
 	 * @param int      $value  The number of rows to use.
 	 */
-	public function set_screen_option( $status, $option, $value ) {
-		if ( in_array( $option, array( 'woocommerce_keys_per_page', 'woocommerce_webhooks_per_page' ), true ) ) {
+	public function set_screen_option($status, $option, $value) {
+		if (in_array($option, array('woocommerce_keys_per_page', 'woocommerce_webhooks_per_page'), true)) {
 			return $value;
 		}
 
@@ -316,7 +316,7 @@ 
 	 * @return void
 	 */
 	public function orders_menu(): void {
-		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+		if (wc_get_container()->get(CustomOrdersTableController::class)->custom_orders_table_usage_is_enabled()) {
 			$this->orders_page_controller = new Custom_Orders_PageController();
 			$this->orders_page_controller->setup();
 		}
@@ -328,7 +328,7 @@ 
 	 * Adapted from http://www.johnmorrisonline.com/how-to-add-a-fully-functional-custom-meta-box-to-wordpress-navigation-menus/.
 	 */
 	public function add_nav_menu_meta_boxes() {
-		add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' );
+		add_meta_box('woocommerce_endpoints_nav_link', __('WooCommerce endpoints', 'woocommerce'), array($this, 'nav_menu_links'), 'nav-menus', 'side', 'low');
 	}
 
 	/**
@@ -339,14 +339,14 @@ 
 		$endpoints = wc_get_account_menu_items();
 
 		// Remove dashboard item.
-		if ( isset( $endpoints['dashboard'] ) ) {
-			unset( $endpoints['dashboard'] );
+		if (isset($endpoints['dashboard'])) {
+			unset($endpoints['dashboard']);
 		}
 
 		// Include missing lost password.
-		$endpoints['lost-password'] = __( 'Lost password', 'woocommerce' );
+		$endpoints['lost-password'] = __('Lost password', 'woocommerce');
 
-		$endpoints = apply_filters( 'woocommerce_custom_nav_menu_items', $endpoints );
+		$endpoints = apply_filters('woocommerce_custom_nav_menu_items', $endpoints);
 
 		?>
 		<div id="posttype-woocommerce-endpoints" class="posttypediv">
@@ -354,16 +354,16 @@ 
 				<ul id="woocommerce-endpoints-checklist" class="categorychecklist form-no-clear">
 					<?php
 					$i = -1;
-					foreach ( $endpoints as $key => $value ) :
+					foreach ($endpoints as $key => $value) :
 						?>
 						<li>
 							<label class="menu-item-title">
-								<input type="checkbox" class="menu-item-checkbox" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-object-id]" value="<?php echo esc_attr( $i ); ?>" /> <?php echo esc_html( $value ); ?>
+								<input type="checkbox" class="menu-item-checkbox" name="menu-item[<?php echo esc_attr($i); ?>][menu-item-object-id]" value="<?php echo esc_attr($i); ?>" /> <?php echo esc_html($value); ?>
 							</label>
-							<input type="hidden" class="menu-item-type" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-type]" value="custom" />
-							<input type="hidden" class="menu-item-title" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-title]" value="<?php echo esc_attr( $value ); ?>" />
-							<input type="hidden" class="menu-item-url" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-url]" value="<?php echo esc_url( wc_get_account_endpoint_url( $key ) ); ?>" />
-							<input type="hidden" class="menu-item-classes" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-classes]" />
+							<input type="hidden" class="menu-item-type" name="menu-item[<?php echo esc_attr($i); ?>][menu-item-type]" value="custom" />
+							<input type="hidden" class="menu-item-title" name="menu-item[<?php echo esc_attr($i); ?>][menu-item-title]" value="<?php echo esc_attr($value); ?>" />
+							<input type="hidden" class="menu-item-url" name="menu-item[<?php echo esc_attr($i); ?>][menu-item-url]" value="<?php echo esc_url(wc_get_account_endpoint_url($key)); ?>" />
+							<input type="hidden" class="menu-item-classes" name="menu-item[<?php echo esc_attr($i); ?>][menu-item-classes]" />
 						</li>
 						<?php
 						$i--;
@@ -373,10 +373,10 @@ 
 			</div>
 			<p class="button-controls">
 				<span class="list-controls">
-					<a href="<?php echo esc_url( admin_url( 'nav-menus.php?page-tab=all&selectall=1#posttype-woocommerce-endpoints' ) ); ?>" class="select-all"><?php esc_html_e( 'Select all', 'woocommerce' ); ?></a>
+					<a href="<?php echo esc_url(admin_url('nav-menus.php?page-tab=all&selectall=1#posttype-woocommerce-endpoints')); ?>" class="select-all"><?php esc_html_e('Select all', 'woocommerce'); ?></a>
 				</span>
 				<span class="add-to-menu">
-					<button type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'woocommerce' ); ?>" name="add-post-type-menu-item" id="submit-posttype-woocommerce-endpoints"><?php esc_html_e( 'Add to menu', 'woocommerce' ); ?></button>
+					<button type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'woocommerce'); ?>" name="add-post-type-menu-item" id="submit-posttype-woocommerce-endpoints"><?php esc_html_e('Add to menu', 'woocommerce'); ?></button>
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -390,18 +390,18 @@ 
 	 * @since 2.4.0
 	 * @param WP_Admin_Bar $wp_admin_bar Admin bar instance.
 	 */
-	public function admin_bar_menus( $wp_admin_bar ) {
-		if ( ! is_admin() || ! is_admin_bar_showing() ) {
+	public function admin_bar_menus($wp_admin_bar) {
+		if (!is_admin() || !is_admin_bar_showing()) {
 			return;
 		}
 
 		// Show only when the user is a member of this site, or they're a super admin.
-		if ( ! is_user_member_of_blog() && ! is_super_admin() ) {
+		if (!is_user_member_of_blog() && !is_super_admin()) {
 			return;
 		}
 
 		// Don't display when shop page is the same of the page on front.
-		if ( intval( get_option( 'page_on_front' ) ) === wc_get_page_id( 'shop' ) ) {
+		if (intval(get_option('page_on_front')) === wc_get_page_id('shop')) {
 			return;
 		}
 
@@ -410,8 +410,8 @@ 
 			array(
 				'parent' => 'site-name',
 				'id'     => 'view-store',
-				'title'  => __( 'Visit Store', 'woocommerce' ),
-				'href'   => wc_get_page_permalink( 'shop' ),
+				'title'  => __('Visit Store', 'woocommerce'),
+				'href'   => wc_get_page_permalink('shop'),
 			)
 		);
 	}

plugins/woocommerce/includes/admin/class-wc-admin-addons.php

Indentation +1172 added lines, -1172 removed lines

@@ -10,7 +10,7 @@ 
 use Automattic\WooCommerce\Admin\RemoteInboxNotifications as PromotionRuleEngine;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -18,323 +18,323 @@ 
  */
 class WC_Admin_Addons {
 
-	/**
-	 * Get featured for the addons screen
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @return array of objects
-	 */
-	public static function get_featured() {
-		$featured = get_transient( 'wc_addons_featured_2' );
-		if ( false === $featured ) {
-			$headers = array();
-			$auth    = WC_Helper_Options::get( 'auth' );
-
-			if ( ! empty( $auth['access_token'] ) ) {
-				$headers['Authorization'] = 'Bearer ' . $auth['access_token'];
-			}
-
-			$raw_featured = wp_safe_remote_get(
-				'https://woocommerce.com/wp-json/wccom-extensions/1.0/featured',
-				array(
-					'headers' => $headers,
-				)
-			);
-
-			if ( ! is_wp_error( $raw_featured ) ) {
-				$featured = json_decode( wp_remote_retrieve_body( $raw_featured ) );
-				if ( $featured ) {
-					set_transient( 'wc_addons_featured_2', $featured, DAY_IN_SECONDS );
-				}
-			}
-		}
-
-		if ( is_object( $featured ) ) {
-			self::output_featured_sections( $featured->sections );
-			return $featured;
-		}
-	}
-
-	/**
-	 * Render featured products and banners using WCCOM's the Featured 2.0 Endpoint
-	 *
-	 * @return void
-	 */
-	public static function render_featured() {
-		$featured = get_transient( 'wc_addons_featured' );
-		if ( false === $featured ) {
-			$headers = array();
-			$auth    = WC_Helper_Options::get( 'auth' );
-
-			if ( ! empty( $auth['access_token'] ) ) {
-				$headers['Authorization'] = 'Bearer ' . $auth['access_token'];
-			}
-
-			$parameter_string = '';
-			$country          = WC()->countries->get_base_country();
-			if ( ! empty( $country ) ) {
-				$parameter_string = '?' . http_build_query( array( 'country' => $country ) );
-			}
-
-			// Important: WCCOM Extensions API v2.0 is used.
-			$raw_featured = wp_safe_remote_get(
-				'https://woocommerce.com/wp-json/wccom-extensions/2.0/featured' . $parameter_string,
-				array(
-					'headers' => $headers,
-				)
-			);
-
-			if ( is_wp_error( $raw_featured ) ) {
-				do_action( 'woocommerce_page_wc-addons_connection_error', $raw_featured->get_error_message() );
-
-				$message = self::is_ssl_error( $raw_featured->get_error_message() )
-					? __( 'We encountered an SSL error. Please ensure your site supports TLS version 1.2 or above.', 'woocommerce' )
-					: $raw_featured->get_error_message();
-
-				self::output_empty( $message );
-
-				return;
-			}
-
-			$response_code = (int) wp_remote_retrieve_response_code( $raw_featured );
-			if ( 200 !== $response_code ) {
-				do_action( 'woocommerce_page_wc-addons_connection_error', $response_code );
-
-				/* translators: %d: HTTP error code. */
-				$message = sprintf(
-					esc_html(
-						/* translators: Error code  */
-						__(
-							'Our request to the featured API got error code %d.',
-							'woocommerce'
-						)
-					),
-					$response_code
-				);
-
-				self::output_empty( $message );
-
-				return;
-			}
-
-			$featured      = json_decode( wp_remote_retrieve_body( $raw_featured ) );
-			if ( empty( $featured ) || ! is_array( $featured ) ) {
-				do_action( 'woocommerce_page_wc-addons_connection_error', 'Empty or malformed response' );
-				$message = __( 'Our request to the featured API got a malformed response.', 'woocommerce' );
-				self::output_empty( $message );
-
-				return;
-			}
-
-			if ( $featured ) {
-				set_transient( 'wc_addons_featured', $featured, DAY_IN_SECONDS );
-			}
-		}
-
-		self::output_featured( $featured );
-	}
-
-	/**
-	 * Check if the error is due to an SSL error
-	 *
-	 * @param string $error_message Error message.
-	 *
-	 * @return bool True if SSL error, false otherwise
-	 */
-	public static function is_ssl_error( $error_message ) {
-		return false !== stripos( $error_message, 'cURL error 35' );
-	}
-
-	/**
-	 * Build url parameter string
-	 *
-	 * @param  string $category Addon (sub) category.
-	 * @param  string $term     Search terms.
-	 * @param  string $country  Store country.
-	 *
-	 * @return string url parameter string
-	 */
-	public static function build_parameter_string( $category, $term, $country ) {
-
-		$parameters = array(
-			'category' => $category,
-			'term'     => $term,
-			'country'  => $country,
-		);
-
-		return '?' . http_build_query( $parameters );
-	}
-
-	/**
-	 * Call API to get extensions
-	 *
-	 * @param  string $category Addon (sub) category.
-	 * @param  string $term     Search terms.
-	 * @param  string $country  Store country.
-	 *
-	 * @return object|WP_Error  Object with products and promotions properties, or WP_Error
-	 */
-	public static function get_extension_data( $category, $term, $country ) {
-		$parameters = self::build_parameter_string( $category, $term, $country );
-
-		$headers = array();
-		$auth    = WC_Helper_Options::get( 'auth' );
-
-		if ( ! empty( $auth['access_token'] ) ) {
-			$headers['Authorization'] = 'Bearer ' . $auth['access_token'];
-		}
-
-		$raw_extensions = wp_safe_remote_get(
-			'https://woocommerce.com/wp-json/wccom-extensions/1.0/search' . $parameters,
-			array( 'headers' => $headers )
-		);
-
-		if ( is_wp_error( $raw_extensions ) ) {
-			do_action( 'woocommerce_page_wc-addons_connection_error', $raw_extensions->get_error_message() );
-			return $raw_extensions;
-		}
-
-		$response_code = (int) wp_remote_retrieve_response_code( $raw_extensions );
-		if ( 200 !== $response_code ) {
-			do_action( 'woocommerce_page_wc-addons_connection_error', $response_code );
-			return new WP_Error(
-				'error',
-				sprintf(
-					esc_html(
-						/* translators: Error code  */
-						__( 'Our request to the search API got response code %s.', 'woocommerce' )
-					),
-					$response_code
-				)
-			);
-		}
-
-		$addons = json_decode( wp_remote_retrieve_body( $raw_extensions ) );
-
-		if ( ! is_object( $addons ) || ! isset( $addons->products ) ) {
-			do_action( 'woocommerce_page_wc-addons_connection_error', 'Empty or malformed response' );
-			return new WP_Error( 'error', __( 'Our request to the search API got a malformed response.', 'woocommerce' ) );
-		}
-
-		return $addons;
-	}
-
-	/**
-	 * Get sections for the addons screen
-	 *
-	 * @return array of objects
-	 */
-	public static function get_sections() {
-		$addon_sections = get_transient( 'wc_addons_sections' );
-		if ( false === ( $addon_sections ) ) {
-			$raw_sections = wp_safe_remote_get(
-				'https://woocommerce.com/wp-json/wccom-extensions/1.0/categories'
-			);
-			if ( ! is_wp_error( $raw_sections ) ) {
-				$addon_sections = json_decode( wp_remote_retrieve_body( $raw_sections ) );
-				if ( $addon_sections ) {
-					set_transient( 'wc_addons_sections', $addon_sections, WEEK_IN_SECONDS );
-				}
-			}
-		}
-		return apply_filters( 'woocommerce_addons_sections', $addon_sections );
-	}
-
-	/**
-	 * Get section for the addons screen.
-	 *
-	 * @param  string $section_id Required section ID.
-	 *
-	 * @return object|bool
-	 */
-	public static function get_section( $section_id ) {
-		$sections = self::get_sections();
-		if ( isset( $sections[ $section_id ] ) ) {
-			return $sections[ $section_id ];
-		}
-		return false;
-	}
-
-
-	/**
-	 * Get section content for the addons screen.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param  string $section_id Required section ID.
-	 *
-	 * @return array
-	 */
-	public static function get_section_data( $section_id ) {
-		$section      = self::get_section( $section_id );
-		$section_data = '';
-
-		if ( ! empty( $section->endpoint ) ) {
-			$section_data = get_transient( 'wc_addons_section_' . $section_id );
-			if ( false === $section_data ) {
-				$raw_section = wp_safe_remote_get( esc_url_raw( $section->endpoint ) );
-
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
-
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wc_addons_section_' . $section_id, $section_data, WEEK_IN_SECONDS );
-					}
-				}
-			}
-		}
-
-		return apply_filters( 'woocommerce_addons_section_data', $section_data->products, $section_id );
-	}
-
-	/**
-	 * Handles the outputting of a contextually aware Storefront link (points to child themes if Storefront is already active).
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 */
-	public static function output_storefront_button() {
-		$template   = get_option( 'template' );
-		$stylesheet = get_option( 'stylesheet' );
-
-		if ( 'storefront' === $template ) {
-			if ( 'storefront' === $stylesheet ) {
-				$url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
-				$text        = __( 'Need a fresh look? Try Storefront child themes', 'woocommerce' );
-				$utm_content = 'nostorefrontchildtheme';
-			} else {
-				$url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
-				$text        = __( 'View more Storefront child themes', 'woocommerce' );
-				$utm_content = 'hasstorefrontchildtheme';
-			}
-		} else {
-			$url         = 'https://woocommerce.com/storefront/';
-			$text        = __( 'Need a theme? Try Storefront', 'woocommerce' );
-			$utm_content = 'nostorefront';
-		}
-
-		$url = add_query_arg(
-			array(
-				'utm_source'   => 'addons',
-				'utm_medium'   => 'product',
-				'utm_campaign' => 'woocommerceplugin',
-				'utm_content'  => $utm_content,
-			),
-			$url
-		);
-
-		echo '<a href="' . esc_url( $url ) . '" class="add-new-h2">' . esc_html( $text ) . '</a>' . "\n";
-	}
-
-	/**
-	 * Handles the outputting of a banner block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Banner data.
-	 */
-	public static function output_banner_block( $block ) {
-		?>
+    /**
+     * Get featured for the addons screen
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @return array of objects
+     */
+    public static function get_featured() {
+        $featured = get_transient( 'wc_addons_featured_2' );
+        if ( false === $featured ) {
+            $headers = array();
+            $auth    = WC_Helper_Options::get( 'auth' );
+
+            if ( ! empty( $auth['access_token'] ) ) {
+                $headers['Authorization'] = 'Bearer ' . $auth['access_token'];
+            }
+
+            $raw_featured = wp_safe_remote_get(
+                'https://woocommerce.com/wp-json/wccom-extensions/1.0/featured',
+                array(
+                    'headers' => $headers,
+                )
+            );
+
+            if ( ! is_wp_error( $raw_featured ) ) {
+                $featured = json_decode( wp_remote_retrieve_body( $raw_featured ) );
+                if ( $featured ) {
+                    set_transient( 'wc_addons_featured_2', $featured, DAY_IN_SECONDS );
+                }
+            }
+        }
+
+        if ( is_object( $featured ) ) {
+            self::output_featured_sections( $featured->sections );
+            return $featured;
+        }
+    }
+
+    /**
+     * Render featured products and banners using WCCOM's the Featured 2.0 Endpoint
+     *
+     * @return void
+     */
+    public static function render_featured() {
+        $featured = get_transient( 'wc_addons_featured' );
+        if ( false === $featured ) {
+            $headers = array();
+            $auth    = WC_Helper_Options::get( 'auth' );
+
+            if ( ! empty( $auth['access_token'] ) ) {
+                $headers['Authorization'] = 'Bearer ' . $auth['access_token'];
+            }
+
+            $parameter_string = '';
+            $country          = WC()->countries->get_base_country();
+            if ( ! empty( $country ) ) {
+                $parameter_string = '?' . http_build_query( array( 'country' => $country ) );
+            }
+
+            // Important: WCCOM Extensions API v2.0 is used.
+            $raw_featured = wp_safe_remote_get(
+                'https://woocommerce.com/wp-json/wccom-extensions/2.0/featured' . $parameter_string,
+                array(
+                    'headers' => $headers,
+                )
+            );
+
+            if ( is_wp_error( $raw_featured ) ) {
+                do_action( 'woocommerce_page_wc-addons_connection_error', $raw_featured->get_error_message() );
+
+                $message = self::is_ssl_error( $raw_featured->get_error_message() )
+                    ? __( 'We encountered an SSL error. Please ensure your site supports TLS version 1.2 or above.', 'woocommerce' )
+                    : $raw_featured->get_error_message();
+
+                self::output_empty( $message );
+
+                return;
+            }
+
+            $response_code = (int) wp_remote_retrieve_response_code( $raw_featured );
+            if ( 200 !== $response_code ) {
+                do_action( 'woocommerce_page_wc-addons_connection_error', $response_code );
+
+                /* translators: %d: HTTP error code. */
+                $message = sprintf(
+                    esc_html(
+                        /* translators: Error code  */
+                        __(
+                            'Our request to the featured API got error code %d.',
+                            'woocommerce'
+                        )
+                    ),
+                    $response_code
+                );
+
+                self::output_empty( $message );
+
+                return;
+            }
+
+            $featured      = json_decode( wp_remote_retrieve_body( $raw_featured ) );
+            if ( empty( $featured ) || ! is_array( $featured ) ) {
+                do_action( 'woocommerce_page_wc-addons_connection_error', 'Empty or malformed response' );
+                $message = __( 'Our request to the featured API got a malformed response.', 'woocommerce' );
+                self::output_empty( $message );
+
+                return;
+            }
+
+            if ( $featured ) {
+                set_transient( 'wc_addons_featured', $featured, DAY_IN_SECONDS );
+            }
+        }
+
+        self::output_featured( $featured );
+    }
+
+    /**
+     * Check if the error is due to an SSL error
+     *
+     * @param string $error_message Error message.
+     *
+     * @return bool True if SSL error, false otherwise
+     */
+    public static function is_ssl_error( $error_message ) {
+        return false !== stripos( $error_message, 'cURL error 35' );
+    }
+
+    /**
+     * Build url parameter string
+     *
+     * @param  string $category Addon (sub) category.
+     * @param  string $term     Search terms.
+     * @param  string $country  Store country.
+     *
+     * @return string url parameter string
+     */
+    public static function build_parameter_string( $category, $term, $country ) {
+
+        $parameters = array(
+            'category' => $category,
+            'term'     => $term,
+            'country'  => $country,
+        );
+
+        return '?' . http_build_query( $parameters );
+    }
+
+    /**
+     * Call API to get extensions
+     *
+     * @param  string $category Addon (sub) category.
+     * @param  string $term     Search terms.
+     * @param  string $country  Store country.
+     *
+     * @return object|WP_Error  Object with products and promotions properties, or WP_Error
+     */
+    public static function get_extension_data( $category, $term, $country ) {
+        $parameters = self::build_parameter_string( $category, $term, $country );
+
+        $headers = array();
+        $auth    = WC_Helper_Options::get( 'auth' );
+
+        if ( ! empty( $auth['access_token'] ) ) {
+            $headers['Authorization'] = 'Bearer ' . $auth['access_token'];
+        }
+
+        $raw_extensions = wp_safe_remote_get(
+            'https://woocommerce.com/wp-json/wccom-extensions/1.0/search' . $parameters,
+            array( 'headers' => $headers )
+        );
+
+        if ( is_wp_error( $raw_extensions ) ) {
+            do_action( 'woocommerce_page_wc-addons_connection_error', $raw_extensions->get_error_message() );
+            return $raw_extensions;
+        }
+
+        $response_code = (int) wp_remote_retrieve_response_code( $raw_extensions );
+        if ( 200 !== $response_code ) {
+            do_action( 'woocommerce_page_wc-addons_connection_error', $response_code );
+            return new WP_Error(
+                'error',
+                sprintf(
+                    esc_html(
+                        /* translators: Error code  */
+                        __( 'Our request to the search API got response code %s.', 'woocommerce' )
+                    ),
+                    $response_code
+                )
+            );
+        }
+
+        $addons = json_decode( wp_remote_retrieve_body( $raw_extensions ) );
+
+        if ( ! is_object( $addons ) || ! isset( $addons->products ) ) {
+            do_action( 'woocommerce_page_wc-addons_connection_error', 'Empty or malformed response' );
+            return new WP_Error( 'error', __( 'Our request to the search API got a malformed response.', 'woocommerce' ) );
+        }
+
+        return $addons;
+    }
+
+    /**
+     * Get sections for the addons screen
+     *
+     * @return array of objects
+     */
+    public static function get_sections() {
+        $addon_sections = get_transient( 'wc_addons_sections' );
+        if ( false === ( $addon_sections ) ) {
+            $raw_sections = wp_safe_remote_get(
+                'https://woocommerce.com/wp-json/wccom-extensions/1.0/categories'
+            );
+            if ( ! is_wp_error( $raw_sections ) ) {
+                $addon_sections = json_decode( wp_remote_retrieve_body( $raw_sections ) );
+                if ( $addon_sections ) {
+                    set_transient( 'wc_addons_sections', $addon_sections, WEEK_IN_SECONDS );
+                }
+            }
+        }
+        return apply_filters( 'woocommerce_addons_sections', $addon_sections );
+    }
+
+    /**
+     * Get section for the addons screen.
+     *
+     * @param  string $section_id Required section ID.
+     *
+     * @return object|bool
+     */
+    public static function get_section( $section_id ) {
+        $sections = self::get_sections();
+        if ( isset( $sections[ $section_id ] ) ) {
+            return $sections[ $section_id ];
+        }
+        return false;
+    }
+
+
+    /**
+     * Get section content for the addons screen.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param  string $section_id Required section ID.
+     *
+     * @return array
+     */
+    public static function get_section_data( $section_id ) {
+        $section      = self::get_section( $section_id );
+        $section_data = '';
+
+        if ( ! empty( $section->endpoint ) ) {
+            $section_data = get_transient( 'wc_addons_section_' . $section_id );
+            if ( false === $section_data ) {
+                $raw_section = wp_safe_remote_get( esc_url_raw( $section->endpoint ) );
+
+                if ( ! is_wp_error( $raw_section ) ) {
+                    $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+
+                    if ( ! empty( $section_data->products ) ) {
+                        set_transient( 'wc_addons_section_' . $section_id, $section_data, WEEK_IN_SECONDS );
+                    }
+                }
+            }
+        }
+
+        return apply_filters( 'woocommerce_addons_section_data', $section_data->products, $section_id );
+    }
+
+    /**
+     * Handles the outputting of a contextually aware Storefront link (points to child themes if Storefront is already active).
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     */
+    public static function output_storefront_button() {
+        $template   = get_option( 'template' );
+        $stylesheet = get_option( 'stylesheet' );
+
+        if ( 'storefront' === $template ) {
+            if ( 'storefront' === $stylesheet ) {
+                $url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
+                $text        = __( 'Need a fresh look? Try Storefront child themes', 'woocommerce' );
+                $utm_content = 'nostorefrontchildtheme';
+            } else {
+                $url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
+                $text        = __( 'View more Storefront child themes', 'woocommerce' );
+                $utm_content = 'hasstorefrontchildtheme';
+            }
+        } else {
+            $url         = 'https://woocommerce.com/storefront/';
+            $text        = __( 'Need a theme? Try Storefront', 'woocommerce' );
+            $utm_content = 'nostorefront';
+        }
+
+        $url = add_query_arg(
+            array(
+                'utm_source'   => 'addons',
+                'utm_medium'   => 'product',
+                'utm_campaign' => 'woocommerceplugin',
+                'utm_content'  => $utm_content,
+            ),
+            $url
+        );
+
+        echo '<a href="' . esc_url( $url ) . '" class="add-new-h2">' . esc_html( $text ) . '</a>' . "\n";
+    }
+
+    /**
+     * Handles the outputting of a banner block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Banner data.
+     */
+    public static function output_banner_block( $block ) {
+        ?>
 		<div class="addons-banner-block">
 			<h1><?php echo esc_html( $block->title ); ?></h1>
 			<p><?php echo esc_html( $block->description ); ?></p>
@@ -349,13 +349,13 @@ 
 								<h3><?php echo esc_html( $item->title ); ?></h3>
 								<p><?php echo esc_html( $item->description ); ?></p>
 								<?php
-									self::output_button(
-										$item->href,
-										$item->button,
-										'addons-button-solid',
-										$item->plugin
-									);
-								?>
+                                    self::output_button(
+                                        $item->href,
+                                        $item->button,
+                                        'addons-button-solid',
+                                        $item->plugin
+                                    );
+                                ?>
 							</div>
 						</div>
 					<?php endif; ?>
@@ -363,46 +363,46 @@ 
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Handles the outputting of a column.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Column data.
-	 */
-	public static function output_column( $block ) {
-		if ( isset( $block->container ) && 'column_container_start' === $block->container ) {
-			?>
+    }
+
+    /**
+     * Handles the outputting of a column.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Column data.
+     */
+    public static function output_column( $block ) {
+        if ( isset( $block->container ) && 'column_container_start' === $block->container ) {
+            ?>
 			<div class="addons-column-section">
 			<?php
-		}
-		if ( 'column_start' === $block->module ) {
-			?>
+        }
+        if ( 'column_start' === $block->module ) {
+            ?>
 			<div class="addons-column">
 			<?php
-		} else {
-			?>
+        } else {
+            ?>
 			</div>
 			<?php
-		}
-		if ( isset( $block->container ) && 'column_container_end' === $block->container ) {
-			?>
+        }
+        if ( isset( $block->container ) && 'column_container_end' === $block->container ) {
+            ?>
 			</div>
 			<?php
-		}
-	}
-
-	/**
-	 * Handles the outputting of a column block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Column block data.
-	 */
-	public static function output_column_block( $block ) {
-		?>
+        }
+    }
+
+    /**
+     * Handles the outputting of a column block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Column block data.
+     */
+    public static function output_column_block( $block ) {
+        ?>
 		<div class="addons-column-block">
 			<h1><?php echo esc_html( $block->title ); ?></h1>
 			<p><?php echo esc_html( $block->description ); ?></p>
@@ -415,13 +415,13 @@ 
 						<div class="addons-column-block-item-content">
 							<h2><?php echo esc_html( $item->title ); ?></h2>
 							<?php
-								self::output_button(
-									$item->href,
-									$item->button,
-									'addons-button-solid',
-									$item->plugin
-								);
-							?>
+                                self::output_button(
+                                    $item->href,
+                                    $item->button,
+                                    'addons-button-solid',
+                                    $item->plugin
+                                );
+                            ?>
 							<p><?php echo esc_html( $item->description ); ?></p>
 						</div>
 					</div>
@@ -430,17 +430,17 @@ 
 		</div>
 
 		<?php
-	}
-
-	/**
-	 * Handles the outputting of a small light block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Block data.
-	 */
-	public static function output_small_light_block( $block ) {
-		?>
+    }
+
+    /**
+     * Handles the outputting of a small light block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Block data.
+     */
+    public static function output_small_light_block( $block ) {
+        ?>
 		<div class="addons-small-light-block">
 			<img class="addons-img" src="<?php echo esc_url( $block->image ); ?>" />
 			<div class="addons-small-light-block-content">
@@ -449,28 +449,28 @@ 
 				<div class="addons-small-light-block-buttons">
 					<?php foreach ( $block->buttons as $button ) : ?>
 						<?php
-							self::output_button(
-								$button->href,
-								$button->text,
-								'addons-button-solid'
-							);
-						?>
+                            self::output_button(
+                                $button->href,
+                                $button->text,
+                                'addons-button-solid'
+                            );
+                        ?>
 					<?php endforeach; ?>
 				</div>
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Handles the outputting of a small dark block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Block data.
-	 */
-	public static function output_small_dark_block( $block ) {
-		?>
+    }
+
+    /**
+     * Handles the outputting of a small dark block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Block data.
+     */
+    public static function output_small_dark_block( $block ) {
+        ?>
 		<div class="addons-small-dark-block">
 			<h1><?php echo esc_html( $block->title ); ?></h1>
 			<p><?php echo esc_html( $block->description ); ?></p>
@@ -483,82 +483,82 @@ 
 							</div>
 						<?php endif; ?>
 						<?php
-							self::output_button(
-								$item->href,
-								$item->button,
-								'addons-button-outline-white'
-							);
-						?>
+                            self::output_button(
+                                $item->href,
+                                $item->button,
+                                'addons-button-outline-white'
+                            );
+                        ?>
 					</div>
 				<?php endforeach; ?>
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Handles the outputting of the WooCommerce Services banner block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Block data.
-	 */
-	public static function output_wcs_banner_block( $block = array() ) {
-		$is_active = is_plugin_active( 'woocommerce-services/woocommerce-services.php' );
-		$location  = wc_get_base_location();
-
-		if (
-			! in_array( $location['country'], array( 'US' ), true ) ||
-			$is_active ||
-			! current_user_can( 'install_plugins' ) ||
-			! current_user_can( 'activate_plugins' )
-		) {
-			return;
-		}
-
-		$button_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'install-addon' => 'woocommerce-services',
-				)
-			),
-			'install-addon_woocommerce-services'
-		);
-
-		$defaults = array(
-			'image'       => WC()->plugin_url() . '/assets/images/wcs-extensions-banner-3x.jpg',
-			'image_alt'   => __( 'WooCommerce Shipping', 'woocommerce' ),
-			'title'       => __( 'Save time and money with WooCommerce Shipping', 'woocommerce' ),
-			'description' => __( 'Print discounted USPS and DHL labels straight from your WooCommerce dashboard and save on shipping.', 'woocommerce' ),
-			'button'      => __( 'Free - Install now', 'woocommerce' ),
-			'href'        => $button_url,
-			'logos'       => array(),
-		);
-
-		switch ( $location['country'] ) {
-			case 'US':
-				$local_defaults = array(
-					'logos' => array_merge(
-						$defaults['logos'],
-						array(
-							array(
-								'link' => WC()->plugin_url() . '/assets/images/wcs-usps-logo.png',
-								'alt'  => 'USPS logo',
-							),
-							array(
-								'link' => WC()->plugin_url() . '/assets/images/wcs-dhlexpress-logo.png',
-								'alt'  => 'DHL Express logo',
-							),
-						)
-					),
-				);
-				break;
-			default:
-				$local_defaults = array();
-		}
-
-		$block_data = array_merge( $defaults, $local_defaults, $block );
-		?>
+    }
+
+    /**
+     * Handles the outputting of the WooCommerce Services banner block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Block data.
+     */
+    public static function output_wcs_banner_block( $block = array() ) {
+        $is_active = is_plugin_active( 'woocommerce-services/woocommerce-services.php' );
+        $location  = wc_get_base_location();
+
+        if (
+            ! in_array( $location['country'], array( 'US' ), true ) ||
+            $is_active ||
+            ! current_user_can( 'install_plugins' ) ||
+            ! current_user_can( 'activate_plugins' )
+        ) {
+            return;
+        }
+
+        $button_url = wp_nonce_url(
+            add_query_arg(
+                array(
+                    'install-addon' => 'woocommerce-services',
+                )
+            ),
+            'install-addon_woocommerce-services'
+        );
+
+        $defaults = array(
+            'image'       => WC()->plugin_url() . '/assets/images/wcs-extensions-banner-3x.jpg',
+            'image_alt'   => __( 'WooCommerce Shipping', 'woocommerce' ),
+            'title'       => __( 'Save time and money with WooCommerce Shipping', 'woocommerce' ),
+            'description' => __( 'Print discounted USPS and DHL labels straight from your WooCommerce dashboard and save on shipping.', 'woocommerce' ),
+            'button'      => __( 'Free - Install now', 'woocommerce' ),
+            'href'        => $button_url,
+            'logos'       => array(),
+        );
+
+        switch ( $location['country'] ) {
+            case 'US':
+                $local_defaults = array(
+                    'logos' => array_merge(
+                        $defaults['logos'],
+                        array(
+                            array(
+                                'link' => WC()->plugin_url() . '/assets/images/wcs-usps-logo.png',
+                                'alt'  => 'USPS logo',
+                            ),
+                            array(
+                                'link' => WC()->plugin_url() . '/assets/images/wcs-dhlexpress-logo.png',
+                                'alt'  => 'DHL Express logo',
+                            ),
+                        )
+                    ),
+                );
+                break;
+            default:
+                $local_defaults = array();
+        }
+
+        $block_data = array_merge( $defaults, $local_defaults, $block );
+        ?>
 		<div class="addons-wcs-banner-block">
 			<div class="addons-wcs-banner-block-image is-full-image">
 				<img
@@ -582,58 +582,58 @@ 
 					<?php endforeach; ?>
 				</ul>
 				<?php
-					self::output_button(
-						$block_data['href'],
-						$block_data['button'],
-						'addons-button-outline-purple'
-					);
-				?>
+                    self::output_button(
+                        $block_data['href'],
+                        $block_data['button'],
+                        'addons-button-outline-purple'
+                    );
+                ?>
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Handles the outputting of the WooCommerce Pay banner block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param object $block Block data.
-	 */
-	public static function output_wcpay_banner_block( $block = array() ) {
-		$is_active = is_plugin_active( 'woocommerce-payments/woocommerce-payments.php' );
-		$location  = wc_get_base_location();
-
-		if (
-			! in_array( $location['country'], array( 'US' ), true ) ||
-			$is_active ||
-			! current_user_can( 'install_plugins' ) ||
-			! current_user_can( 'activate_plugins' )
-		) {
-			return;
-		}
-
-		$button_url = wp_nonce_url(
-			add_query_arg(
-				array(
-					'install-addon' => 'woocommerce-payments',
-				)
-			),
-			'install-addon_woocommerce-payments'
-		);
-
-		$defaults = array(
-			'image'       => WC()->plugin_url() . '/assets/images/wcpayments-icon-secure.png',
-			'image_alt'   => __( 'WooCommerce Payments', 'woocommerce' ),
-			'title'       => __( 'Payments made simple, with no monthly fees &mdash; exclusively for WooCommerce stores.', 'woocommerce' ),
-			'description' => __( 'Securely accept cards in your store. See payments, track cash flow into your bank account, and stay on top of disputes – right from your dashboard.', 'woocommerce' ),
-			'button'      => __( 'Free - Install now', 'woocommerce' ),
-			'href'        => $button_url,
-			'logos'       => array(),
-		);
-
-		$block_data = array_merge( $defaults, $block );
-		?>
+    }
+
+    /**
+     * Handles the outputting of the WooCommerce Pay banner block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param object $block Block data.
+     */
+    public static function output_wcpay_banner_block( $block = array() ) {
+        $is_active = is_plugin_active( 'woocommerce-payments/woocommerce-payments.php' );
+        $location  = wc_get_base_location();
+
+        if (
+            ! in_array( $location['country'], array( 'US' ), true ) ||
+            $is_active ||
+            ! current_user_can( 'install_plugins' ) ||
+            ! current_user_can( 'activate_plugins' )
+        ) {
+            return;
+        }
+
+        $button_url = wp_nonce_url(
+            add_query_arg(
+                array(
+                    'install-addon' => 'woocommerce-payments',
+                )
+            ),
+            'install-addon_woocommerce-payments'
+        );
+
+        $defaults = array(
+            'image'       => WC()->plugin_url() . '/assets/images/wcpayments-icon-secure.png',
+            'image_alt'   => __( 'WooCommerce Payments', 'woocommerce' ),
+            'title'       => __( 'Payments made simple, with no monthly fees &mdash; exclusively for WooCommerce stores.', 'woocommerce' ),
+            'description' => __( 'Securely accept cards in your store. See payments, track cash flow into your bank account, and stay on top of disputes – right from your dashboard.', 'woocommerce' ),
+            'button'      => __( 'Free - Install now', 'woocommerce' ),
+            'href'        => $button_url,
+            'logos'       => array(),
+        );
+
+        $block_data = array_merge( $defaults, $block );
+        ?>
 		<div class="addons-wcs-banner-block">
 			<div class="addons-wcs-banner-block-image">
 				<img
@@ -646,26 +646,26 @@ 
 				<h1><?php echo esc_html( $block_data['title'] ); ?></h1>
 				<p><?php echo esc_html( $block_data['description'] ); ?></p>
 				<?php
-					self::output_button(
-						$block_data['href'],
-						$block_data['button'],
-						'addons-button-outline-purple'
-					);
-				?>
+                    self::output_button(
+                        $block_data['href'],
+                        $block_data['button'],
+                        'addons-button-outline-purple'
+                    );
+                ?>
 			</div>
 		</div>
 		<?php
-	}
+    }
 
 
-	/**
-	 * Output the HTML for the promotion block.
-	 *
-	 * @param array $promotion Array of promotion block data.
-	 * @return void
-	 */
-	public static function output_search_promotion_block( array $promotion ) {
-		?>
+    /**
+     * Output the HTML for the promotion block.
+     *
+     * @param array $promotion Array of promotion block data.
+     * @return void
+     */
+    public static function output_search_promotion_block( array $promotion ) {
+        ?>
 		<div class="addons-wcs-banner-block">
 			<div class="addons-wcs-banner-block-image">
 				<img
@@ -678,48 +678,48 @@ 
 				<h1><?php echo esc_html( $promotion['title'] ); ?></h1>
 				<p><?php echo esc_html( $promotion['description'] ); ?></p>
 				<?php
-				if ( ! empty( $promotion['actions'] ) ) {
-					foreach ( $promotion['actions'] as $action ) {
-						self::output_promotion_action( $action );
-					}
-				}
-				?>
+                if ( ! empty( $promotion['actions'] ) ) {
+                    foreach ( $promotion['actions'] as $action ) {
+                        self::output_promotion_action( $action );
+                    }
+                }
+                ?>
 			</div>
 		</div>
 		<?php
-	}
-
-
-	/**
-	 * Handles the output of a full-width block.
-	 *
-	 * @deprecated 5.9.0 No longer used in In-App Marketplace
-	 *
-	 * @param array $section Section data.
-	 */
-	public static function output_promotion_block( $section ) {
-		if (
-			! current_user_can( 'install_plugins' ) ||
-			! current_user_can( 'activate_plugins' )
-		) {
-			return;
-		}
-
-		$section_object = (object) $section;
-
-		if ( ! empty( $section_object->geowhitelist ) ) {
-			$section_object->geowhitelist = explode( ',', $section_object->geowhitelist );
-		}
-
-		if ( ! empty( $section_object->geoblacklist ) ) {
-			$section_object->geoblacklist = explode( ',', $section_object->geoblacklist );
-		}
-
-		if ( ! self::show_extension( $section_object ) ) {
-			return;
-		}
-
-		?>
+    }
+
+
+    /**
+     * Handles the output of a full-width block.
+     *
+     * @deprecated 5.9.0 No longer used in In-App Marketplace
+     *
+     * @param array $section Section data.
+     */
+    public static function output_promotion_block( $section ) {
+        if (
+            ! current_user_can( 'install_plugins' ) ||
+            ! current_user_can( 'activate_plugins' )
+        ) {
+            return;
+        }
+
+        $section_object = (object) $section;
+
+        if ( ! empty( $section_object->geowhitelist ) ) {
+            $section_object->geowhitelist = explode( ',', $section_object->geowhitelist );
+        }
+
+        if ( ! empty( $section_object->geoblacklist ) ) {
+            $section_object->geoblacklist = explode( ',', $section_object->geoblacklist );
+        }
+
+        if ( ! self::show_extension( $section_object ) ) {
+            return;
+        }
+
+        ?>
 		<div class="addons-banner-block addons-promotion-block">
 			<img
 				class="addons-img"
@@ -733,100 +733,100 @@ 
 				</div>
 				<div class="addons-promotion-block-buttons">
 					<?php
-					if ( $section['button_1'] ) {
-						self::output_button(
-							$section['button_1_href'],
-							$section['button_1'],
-							'addons-button-expandable addons-button-solid',
-							$section['plugin']
-						);
-					}
-
-					if ( $section['button_2'] ) {
-						self::output_button(
-							$section['button_2_href'],
-							$section['button_2'],
-							'addons-button-expandable addons-button-outline-purple',
-							$section['plugin']
-						);
-					}
-					?>
+                    if ( $section['button_1'] ) {
+                        self::output_button(
+                            $section['button_1_href'],
+                            $section['button_1'],
+                            'addons-button-expandable addons-button-solid',
+                            $section['plugin']
+                        );
+                    }
+
+                    if ( $section['button_2'] ) {
+                        self::output_button(
+                            $section['button_2_href'],
+                            $section['button_2'],
+                            'addons-button-expandable addons-button-outline-purple',
+                            $section['plugin']
+                        );
+                    }
+                    ?>
 				</div>
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Handles the outputting of featured sections
-	 *
-	 * @param array $sections Section data.
-	 */
-	public static function output_featured_sections( $sections ) {
-		foreach ( $sections as $section ) {
-			switch ( $section->module ) {
-				case 'banner_block':
-					self::output_banner_block( $section );
-					break;
-				case 'column_start':
-					self::output_column( $section );
-					break;
-				case 'column_end':
-					self::output_column( $section );
-					break;
-				case 'column_block':
-					self::output_column_block( $section );
-					break;
-				case 'small_light_block':
-					self::output_small_light_block( $section );
-					break;
-				case 'small_dark_block':
-					self::output_small_dark_block( $section );
-					break;
-				case 'wcs_banner_block':
-					self::output_wcs_banner_block( (array) $section );
-					break;
-				case 'wcpay_banner_block':
-					self::output_wcpay_banner_block( (array) $section );
-					break;
-				case 'promotion_block':
-					self::output_promotion_block( (array) $section );
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Handles the outputting of featured page
-	 *
-	 * @param array $blocks Featured page's blocks.
-	 */
-	private static function output_featured( $blocks ) {
-		foreach ( $blocks as $block ) {
-			$block_type = $block->type ?? null;
-			switch ( $block_type ) {
-				case 'group':
-					self::output_group( $block );
-					break;
-				case 'banner':
-					self::output_banner( $block );
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Render a group block including products
-	 *
-	 * @param mixed $block Block of the page for rendering.
-	 *
-	 * @return void
-	 */
-	private static function output_group( $block ) {
-		$capacity             = $block->capacity ?? 3;
-		$product_list_classes = 3 === $capacity ? 'three-column' : 'two-column';
-		$product_list_classes = 'products addons-products-' . $product_list_classes;
-		?>
+    }
+
+    /**
+     * Handles the outputting of featured sections
+     *
+     * @param array $sections Section data.
+     */
+    public static function output_featured_sections( $sections ) {
+        foreach ( $sections as $section ) {
+            switch ( $section->module ) {
+                case 'banner_block':
+                    self::output_banner_block( $section );
+                    break;
+                case 'column_start':
+                    self::output_column( $section );
+                    break;
+                case 'column_end':
+                    self::output_column( $section );
+                    break;
+                case 'column_block':
+                    self::output_column_block( $section );
+                    break;
+                case 'small_light_block':
+                    self::output_small_light_block( $section );
+                    break;
+                case 'small_dark_block':
+                    self::output_small_dark_block( $section );
+                    break;
+                case 'wcs_banner_block':
+                    self::output_wcs_banner_block( (array) $section );
+                    break;
+                case 'wcpay_banner_block':
+                    self::output_wcpay_banner_block( (array) $section );
+                    break;
+                case 'promotion_block':
+                    self::output_promotion_block( (array) $section );
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Handles the outputting of featured page
+     *
+     * @param array $blocks Featured page's blocks.
+     */
+    private static function output_featured( $blocks ) {
+        foreach ( $blocks as $block ) {
+            $block_type = $block->type ?? null;
+            switch ( $block_type ) {
+                case 'group':
+                    self::output_group( $block );
+                    break;
+                case 'banner':
+                    self::output_banner( $block );
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Render a group block including products
+     *
+     * @param mixed $block Block of the page for rendering.
+     *
+     * @return void
+     */
+    private static function output_group( $block ) {
+        $capacity             = $block->capacity ?? 3;
+        $product_list_classes = 3 === $capacity ? 'three-column' : 'two-column';
+        $product_list_classes = 'products addons-products-' . $product_list_classes;
+        ?>
 			<section class="addon-product-group">
 				<h2 class="addon-product-group-title"><?php echo esc_html( $block->title ); ?></h2>
 				<div class="addon-product-group-description-container">
@@ -844,35 +844,35 @@ 
 				<div class="addon-product-group__items">
 					<ul class="<?php echo esc_attr( $product_list_classes ); ?>">
 					<?php
-					$products = array_slice( $block->items, 0, $capacity );
-					foreach ( $products as $item ) {
-						self::render_product_card( $item );
-					}
-					?>
+                    $products = array_slice( $block->items, 0, $capacity );
+                    foreach ( $products as $item ) {
+                        self::render_product_card( $item );
+                    }
+                    ?>
 					</ul>
 				<div>
 			</section>
 		<?php
-	}
-
-	/**
-	 * Render a banner contains a product
-	 *
-	 * @param mixed $block Block of the page for rendering.
-	 *
-	 * @return void
-	 */
-	private static function output_banner( $block ) {
-		if ( empty( $block->buttons ) ) {
-			// Render a product-like banner.
-			?>
+    }
+
+    /**
+     * Render a banner contains a product
+     *
+     * @param mixed $block Block of the page for rendering.
+     *
+     * @return void
+     */
+    private static function output_banner( $block ) {
+        if ( empty( $block->buttons ) ) {
+            // Render a product-like banner.
+            ?>
 			<ul class="products">
 				<?php self::render_product_card( $block, $block->type ); ?>
 			</ul>
 			<?php
-		} else {
-			// Render a banner with buttons.
-			?>
+        } else {
+            // Render a banner with buttons.
+            ?>
 			<ul class="products">
 				<li class="product addons-buttons-banner">
 					<div class="addons-buttons-banner-image"
@@ -885,13 +885,13 @@ 
 						</div>
 						<div class="addons-buttons-banner-button-container">
 						<?php
-						foreach ( $block->buttons as $button ) {
-							$button_classes = array( 'button', 'addons-buttons-banner-button' );
-							$type           = $button->type ?? null;
-							if ( 'primary' === $type ) {
-								$button_classes[] = 'addons-buttons-banner-button-primary';
-							}
-							?>
+                        foreach ( $block->buttons as $button ) {
+                            $button_classes = array( 'button', 'addons-buttons-banner-button' );
+                            $type           = $button->type ?? null;
+                            if ( 'primary' === $type ) {
+                                $button_classes[] = 'addons-buttons-banner-button-primary';
+                            }
+                            ?>
 							<a class="<?php echo esc_attr( implode( ' ', $button_classes ) ); ?>"
 								href="<?php echo esc_url( $button->href ); ?>">
 								<?php echo esc_html( $button->title ); ?>
@@ -902,91 +902,91 @@ 
 				</li>
 			</ul>
 			<?php
-		}
-	}
-
-	/**
-	 * Returns in-app-purchase URL params.
-	 */
-	public static function get_in_app_purchase_url_params() {
-		// Get url (from path onward) for the current page,
-		// so WCCOM "back" link returns user to where they were.
-		$back_admin_path = add_query_arg( array() );
-		return array(
-			'wccom-site'          => site_url(),
-			'wccom-back'          => rawurlencode( $back_admin_path ),
-			'wccom-woo-version'   => Constants::get_constant( 'WC_VERSION' ),
-			'wccom-connect-nonce' => wp_create_nonce( 'connect' ),
-		);
-	}
-
-	/**
-	 * Add in-app-purchase URL params to link.
-	 *
-	 * Adds various url parameters to a url to support a streamlined
-	 * flow for obtaining and setting up WooCommerce extensons.
-	 *
-	 * @param string $url    Destination URL.
-	 */
-	public static function add_in_app_purchase_url_params( $url ) {
-		return add_query_arg(
-			self::get_in_app_purchase_url_params(),
-			$url
-		);
-	}
-
-	/**
-	 * Outputs a button.
-	 *
-	 * @param string $url    Destination URL.
-	 * @param string $text   Button label text.
-	 * @param string $style  Button style class.
-	 * @param string $plugin The plugin the button is promoting.
-	 */
-	public static function output_button( $url, $text, $style, $plugin = '' ) {
-		$style = __( 'Free', 'woocommerce' ) === $text ? 'addons-button-outline-purple' : $style;
-		$style = is_plugin_active( $plugin ) ? 'addons-button-installed' : $style;
-		$text  = is_plugin_active( $plugin ) ? __( 'Installed', 'woocommerce' ) : $text;
-		$url   = self::add_in_app_purchase_url_params( $url );
-		?>
+        }
+    }
+
+    /**
+     * Returns in-app-purchase URL params.
+     */
+    public static function get_in_app_purchase_url_params() {
+        // Get url (from path onward) for the current page,
+        // so WCCOM "back" link returns user to where they were.
+        $back_admin_path = add_query_arg( array() );
+        return array(
+            'wccom-site'          => site_url(),
+            'wccom-back'          => rawurlencode( $back_admin_path ),
+            'wccom-woo-version'   => Constants::get_constant( 'WC_VERSION' ),
+            'wccom-connect-nonce' => wp_create_nonce( 'connect' ),
+        );
+    }
+
+    /**
+     * Add in-app-purchase URL params to link.
+     *
+     * Adds various url parameters to a url to support a streamlined
+     * flow for obtaining and setting up WooCommerce extensons.
+     *
+     * @param string $url    Destination URL.
+     */
+    public static function add_in_app_purchase_url_params( $url ) {
+        return add_query_arg(
+            self::get_in_app_purchase_url_params(),
+            $url
+        );
+    }
+
+    /**
+     * Outputs a button.
+     *
+     * @param string $url    Destination URL.
+     * @param string $text   Button label text.
+     * @param string $style  Button style class.
+     * @param string $plugin The plugin the button is promoting.
+     */
+    public static function output_button( $url, $text, $style, $plugin = '' ) {
+        $style = __( 'Free', 'woocommerce' ) === $text ? 'addons-button-outline-purple' : $style;
+        $style = is_plugin_active( $plugin ) ? 'addons-button-installed' : $style;
+        $text  = is_plugin_active( $plugin ) ? __( 'Installed', 'woocommerce' ) : $text;
+        $url   = self::add_in_app_purchase_url_params( $url );
+        ?>
 		<a
 			class="addons-button <?php echo esc_attr( $style ); ?>"
 			href="<?php echo esc_url( $url ); ?>">
 			<?php echo esc_html( $text ); ?>
 		</a>
 		<?php
-	}
-
-	/**
-	 * Output HTML for a promotion action.
-	 *
-	 * @param array $action Array of action properties.
-	 *
-	 * @return void
-	 */
-	public static function output_promotion_action( array $action ) {
-		if ( empty( $action ) ) {
-			return;
-		}
-		$style = ( ! empty( $action['primary'] ) && $action['primary'] ) ? 'addons-button-solid' : 'addons-button-outline-purple';
-		?>
+    }
+
+    /**
+     * Output HTML for a promotion action.
+     *
+     * @param array $action Array of action properties.
+     *
+     * @return void
+     */
+    public static function output_promotion_action( array $action ) {
+        if ( empty( $action ) ) {
+            return;
+        }
+        $style = ( ! empty( $action['primary'] ) && $action['primary'] ) ? 'addons-button-solid' : 'addons-button-outline-purple';
+        ?>
 		<a
 			class="addons-button <?php echo esc_attr( $style ); ?>"
 			href="<?php echo esc_url( $action['url'] ); ?>">
 			<?php echo esc_html( $action['label'] ); ?>
 		</a>
 		<?php
-	}
-
-	/**
-	 * Output HTML for a promotion action if data couldn't be fetched.
-	 *
-	 * @param string $message Error message.
-	 *
-	 * @return void
-	 */
-	public static function output_empty( $message = '' ) {
-		?>
+    }
+
+    /**
+     * Output HTML for a promotion action if data couldn't be fetched.
+     *
+     * @param string $message Error message.
+     *
+     * @return void
+     */
+    public static function output_empty( $message = '' ) {
+        ?>
 		<div class="wc-addons__empty">
 			<h2><?php echo wp_kses_post( __( 'Oh no! We\'re having trouble connecting to the extensions catalog right now.', 'woocommerce' ) ); ?></h2>
 			<?php if ( ! empty( $message ) ) : ?>
@@ -994,383 +994,383 @@ 
 			<?php endif; ?>
 			<p>
 				<?php
-				printf(
-					wp_kses_post(
-						/* translators: a url */
-						__(
-							'To start growing your business, head over to <a href="%s">WooCommerce.com</a>, where you\'ll find the most popular WooCommerce extensions.',
-							'woocommerce'
-						)
-					),
-					'https://woocommerce.com/products/?utm_source=extensionsscreen&utm_medium=product&utm_campaign=connectionerror'
-				);
-				?>
+                printf(
+                    wp_kses_post(
+                        /* translators: a url */
+                        __(
+                            'To start growing your business, head over to <a href="%s">WooCommerce.com</a>, where you\'ll find the most popular WooCommerce extensions.',
+                            'woocommerce'
+                        )
+                    ),
+                    'https://woocommerce.com/products/?utm_source=extensionsscreen&utm_medium=product&utm_campaign=connectionerror'
+                );
+                ?>
 			</p>
 		</div>
 		<?php
-	}
-
-
-	/**
-	 * Handles output of the addons page in admin.
-	 */
-	public static function output() {
-		$section = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '_featured';
-		$search  = isset( $_GET['search'] ) ? sanitize_text_field( wp_unslash( $_GET['search'] ) ) : '';
-
-		if ( isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
-			do_action( 'woocommerce_helper_output' );
-			return;
-		}
-
-		if ( isset( $_GET['install-addon'] ) ) {
-			switch ( $_GET['install-addon'] ) {
-				case 'woocommerce-services':
-					self::install_woocommerce_services_addon();
-					break;
-				case 'woocommerce-payments':
-					self::install_woocommerce_payments_addon( $section );
-					break;
-				default:
-					// Do nothing.
-					break;
-			}
-		}
-
-		$sections        = self::get_sections();
-		$theme           = wp_get_theme();
-		$current_section = isset( $_GET['section'] ) ? $section : '_featured';
-		$promotions      = array();
-		$addons          = array();
-
-		if ( '_featured' !== $current_section ) {
-			$category       = $section ? $section : null;
-			$term           = $search ? $search : null;
-			$country        = WC()->countries->get_base_country();
-			$extension_data = self::get_extension_data( $category, $term, $country );
-			$addons         = is_wp_error( $extension_data ) ? $extension_data : $extension_data->products;
-			$promotions     = ! empty( $extension_data->promotions ) ? $extension_data->promotions : array();
-		}
-
-		// We need Automattic\WooCommerce\Admin\RemoteInboxNotifications for the next part, if not remove all promotions.
-		if ( ! WC()->is_wc_admin_active() ) {
-			$promotions = array();
-		}
-		// Check for existence of promotions and evaluate out if we should show them.
-		if ( ! empty( $promotions ) ) {
-			foreach ( $promotions as $promo_id => $promotion ) {
-				$evaluator = new PromotionRuleEngine\RuleEvaluator();
-				$passed    = $evaluator->evaluate( $promotion->rules );
-				if ( ! $passed ) {
-					unset( $promotions[ $promo_id ] );
-				}
-			}
-			// Transform promotions to the correct format ready for output.
-			$promotions = self::format_promotions( $promotions );
-		}
-
-		/**
-		 * Addon page view.
-		 *
-		 * @uses $addons
-		 * @uses $search
-		 * @uses $sections
-		 * @uses $theme
-		 * @uses $current_section
-		 */
-		include_once dirname( __FILE__ ) . '/views/html-admin-page-addons.php';
-	}
-
-	/**
-	 * Install WooCommerce Services from Extensions screens.
-	 */
-	public static function install_woocommerce_services_addon() {
-		check_admin_referer( 'install-addon_woocommerce-services' );
-
-		$services_plugin_id = 'woocommerce-services';
-		$services_plugin    = array(
-			'name'      => __( 'WooCommerce Services', 'woocommerce' ),
-			'repo-slug' => 'woocommerce-services',
-		);
-
-		WC_Install::background_installer( $services_plugin_id, $services_plugin );
-
-		wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) );
-		exit;
-	}
-
-	/**
-	 * Install WooCommerce Payments from the Extensions screens.
-	 *
-	 * @param string $section Optional. Extenstions tab.
-	 *
-	 * @return void
-	 */
-	public static function install_woocommerce_payments_addon( $section = '_featured' ) {
-		check_admin_referer( 'install-addon_woocommerce-payments' );
-
-		$wcpay_plugin_id = 'woocommerce-payments';
-		$wcpay_plugin    = array(
-			'name'      => __( 'WooCommerce Payments', 'woocommerce' ),
-			'repo-slug' => 'woocommerce-payments',
-		);
-
-		WC_Install::background_installer( $wcpay_plugin_id, $wcpay_plugin );
-
-		do_action( 'woocommerce_addon_installed', $wcpay_plugin_id, $section );
-
-		wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) );
-		exit;
-	}
-
-	/**
-	 * We're displaying page=wc-addons and page=wc-addons&section=helper as two separate pages.
-	 * When we're on those pages, add body classes to distinguishe them.
-	 *
-	 * @param string $admin_body_class Unfiltered body class.
-	 *
-	 * @return string Body class with added class for Marketplace or My Subscriptions page.
-	 */
-	public static function filter_admin_body_classes( string $admin_body_class = '' ): string {
-		if ( isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
-			return " $admin_body_class woocommerce-page-wc-subscriptions ";
-		}
-
-		return " $admin_body_class woocommerce-page-wc-marketplace ";
-	}
-
-	/**
-	 * Determine which class should be used for a rating star:
-	 * - golden
-	 * - half-filled (50/50 golden and gray)
-	 * - gray
-	 *
-	 * Consider ratings from 3.0 to 4.0 as an example
-	 * 3.0 will produce 3 stars
-	 * 3.1 to 3.5 will produce 3 stars and a half star
-	 * 3.6 to 4.0 will product 4 stars
-	 *
-	 * @param float $rating Rating of a product.
-	 * @param int   $index  Index of a star in a row.
-	 *
-	 * @return string CSS class to use.
-	 */
-	public static function get_star_class( $rating, $index ) {
-		if ( $rating >= $index ) {
-			// Rating more that current star to show.
-			return 'fill';
-		} elseif (
-			abs( $index - 1 - floor( $rating ) ) < 0.0000001 &&
-			0 < ( $rating - floor( $rating ) )
-		) {
-			// For rating more than x.0 and less than x.5 or equal it will show a half star.
-			return 50 >= floor( ( $rating - floor( $rating ) ) * 100 )
-				? 'half-fill'
-				: 'fill';
-		}
-
-		// Don't show a golden star otherwise.
-		return 'no-fill';
-	}
-
-	/**
-	 * Take an action object and return the URL based on properties of the action.
-	 *
-	 * @param object $action Action object.
-	 * @return string URL.
-	 */
-	public static function get_action_url( $action ): string {
-		if ( ! isset( $action->url ) ) {
-			return '';
-		}
-
-		if ( isset( $action->url_is_admin_query ) && $action->url_is_admin_query ) {
-			return wc_admin_url( $action->url );
-		}
-
-		if ( isset( $action->url_is_admin_nonce_query ) && $action->url_is_admin_nonce_query ) {
-			if ( empty( $action->nonce ) ) {
-				return '';
-			}
-			return wp_nonce_url(
-				admin_url( $action->url ),
-				$action->nonce
-			);
-		}
-
-		return $action->url;
-	}
-
-	/**
-	 * Format the promotion data ready for display, ie fetch locales and actions.
-	 *
-	 * @param array $promotions Array of promotoin objects.
-	 * @return array Array of formatted promotions ready for output.
-	 */
-	public static function format_promotions( array $promotions ): array {
-		$formatted_promotions = array();
-		foreach ( $promotions as $promotion ) {
-			// Get the matching locale or fall back to en-US.
-			$locale = PromotionRuleEngine\SpecRunner::get_locale( $promotion->locales );
-			if ( null === $locale ) {
-				continue;
-			}
-
-			$promotion_actions = array();
-			if ( ! empty( $promotion->actions ) ) {
-				foreach ( $promotion->actions as $action ) {
-					$action_locale = PromotionRuleEngine\SpecRunner::get_action_locale( $action->locales );
-					$url           = self::get_action_url( $action );
-
-					$promotion_actions[] = array(
-						'name'    => $action->name,
-						'label'   => $action_locale->label,
-						'url'     => $url,
-						'primary' => isset( $action->is_primary ) ? $action->is_primary : false,
-					);
-				}
-			}
-
-			$formatted_promotions[] = array(
-				'title'       => $locale->title,
-				'description' => $locale->description,
-				'image'       => ( 'http' === substr( $locale->image, 0, 4 ) ) ? $locale->image : WC()->plugin_url() . $locale->image,
-				'image_alt'   => $locale->image_alt,
-				'actions'     => $promotion_actions,
-			);
-		}
-		return $formatted_promotions;
-	}
-
-	/**
-	 * Map data from different endpoints to a universal format
-	 *
-	 * Search and featured products has a slightly different products' field names.
-	 * Mapping converts different data structures into a universal one for further processing.
-	 *
-	 * @param mixed $data Product Card Data.
-	 *
-	 * @return object Converted data.
-	 */
-	public static function map_product_card_data( $data ) {
-		$mapped = (object) null;
-
-		$type = $data->type ?? null;
-
-		// Icon.
-		$mapped->icon = $data->icon ?? null;
-		if ( null === $mapped->icon && 'banner' === $type ) {
-			// For product-related banners icon is a product's image.
-			$mapped->icon = $data->image ?? null;
-		}
-
-		// URL.
-		$mapped->url = $data->link ?? null;
-		if ( empty( $mapped->url ) ) {
-			$mapped->url = $data->url ?? null;
-		}
-
-		// Title.
-		$mapped->title = $data->title ?? null;
-
-		// Vendor Name.
-		$mapped->vendor_name = $data->vendor_name ?? null;
-		if ( empty( $mapped->vendor_name ) ) {
-			$mapped->vendor_name = $data->vendorName ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		}
-
-		// Vendor URL.
-		$mapped->vendor_url = $data->vendor_url ?? null;
-		if ( empty( $mapped->vendor_url ) ) {
-			$mapped->vendor_url = $data->vendorUrl ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		}
-
-		// Description.
-		$mapped->description = $data->excerpt ?? null;
-		if ( empty( $mapped->description ) ) {
-			$mapped->description = $data->description ?? null;
-		}
-
-		$has_currency = ! empty( $data->currency ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-
-		// Is Free.
-		if ( $has_currency ) {
-			$mapped->is_free = 0 === (int) $data->price;
-		} else {
-			$mapped->is_free = '&#36;0.00' === $data->price;
-		}
-
-		// Price.
-		if ( $has_currency ) {
-			$mapped->price = wc_price( $data->price, array( 'currency' => $data->currency ) );
-		} else {
-			$mapped->price = $data->price;
-		}
-
-		// Price suffix, e.g. "per month".
-		$mapped->price_suffix = $data->price_suffix ?? null;
-
-		// Rating.
-		$mapped->rating = $data->rating ?? null;
-		if ( null === $mapped->rating ) {
-			$mapped->rating = $data->averageRating ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		}
-
-		// Reviews Count.
-		$mapped->reviews_count = $data->reviews_count ?? null;
-		if ( null === $mapped->reviews_count ) {
-			$mapped->reviews_count = $data->reviewsCount ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		}
-		// Featured & Promoted product card.
-		// Label.
-		$mapped->label = $data->label ?? null;
-		// Primary color.
-		$mapped->primary_color = $data->primary_color ?? null;
-		// Text color.
-		$mapped->text_color = $data->text_color ?? null;
-		// Button text.
-		$mapped->button = $data->button ?? null;
-
-		return $mapped;
-	}
-
-	/**
-	 * Render a product card
-	 *
-	 * There's difference in data structure (e.g. field names) between endpoints such as search and
-	 * featured. Inner mapping helps to use universal field names for further work.
-	 *
-	 * @param mixed  $data       Product data.
-	 * @param string $block_type Block type that's different from the default product card, e.g. a banner.
-	 *
-	 * @return void
-	 */
-	public static function render_product_card( $data, $block_type = null ) {
-		$mapped      = self::map_product_card_data( $data );
-		$product_url = self::add_in_app_purchase_url_params( $mapped->url );
-		$class_names = array( 'product' );
-		// Specify a class name according to $block_type (if it's specified).
-		if ( null !== $block_type ) {
-			$class_names[] = 'addons-product-' . $block_type;
-		}
-
-		$product_details_classes = 'product-details';
-		if ( 'banner' === $block_type ) {
-			$product_details_classes .= ' addon-product-banner-details';
-		}
-
-		if ( isset( $mapped->label ) && 'promoted' === $mapped->label ) {
-			$product_details_classes .= ' promoted';
-		} elseif ( isset( $mapped->label ) && 'featured' === $mapped->label ) {
-			$product_details_classes .= ' featured';
-		}
-
-		if ( 'promoted' === $mapped->label
-			&& ! empty( $mapped->primary_color )
-			&& ! empty( $mapped->text_color )
-			&& ! empty( $mapped->button ) ) {
-			// Promoted product card.
-			?>
+    }
+
+
+    /**
+     * Handles output of the addons page in admin.
+     */
+    public static function output() {
+        $section = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '_featured';
+        $search  = isset( $_GET['search'] ) ? sanitize_text_field( wp_unslash( $_GET['search'] ) ) : '';
+
+        if ( isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
+            do_action( 'woocommerce_helper_output' );
+            return;
+        }
+
+        if ( isset( $_GET['install-addon'] ) ) {
+            switch ( $_GET['install-addon'] ) {
+                case 'woocommerce-services':
+                    self::install_woocommerce_services_addon();
+                    break;
+                case 'woocommerce-payments':
+                    self::install_woocommerce_payments_addon( $section );
+                    break;
+                default:
+                    // Do nothing.
+                    break;
+            }
+        }
+
+        $sections        = self::get_sections();
+        $theme           = wp_get_theme();
+        $current_section = isset( $_GET['section'] ) ? $section : '_featured';
+        $promotions      = array();
+        $addons          = array();
+
+        if ( '_featured' !== $current_section ) {
+            $category       = $section ? $section : null;
+            $term           = $search ? $search : null;
+            $country        = WC()->countries->get_base_country();
+            $extension_data = self::get_extension_data( $category, $term, $country );
+            $addons         = is_wp_error( $extension_data ) ? $extension_data : $extension_data->products;
+            $promotions     = ! empty( $extension_data->promotions ) ? $extension_data->promotions : array();
+        }
+
+        // We need Automattic\WooCommerce\Admin\RemoteInboxNotifications for the next part, if not remove all promotions.
+        if ( ! WC()->is_wc_admin_active() ) {
+            $promotions = array();
+        }
+        // Check for existence of promotions and evaluate out if we should show them.
+        if ( ! empty( $promotions ) ) {
+            foreach ( $promotions as $promo_id => $promotion ) {
+                $evaluator = new PromotionRuleEngine\RuleEvaluator();
+                $passed    = $evaluator->evaluate( $promotion->rules );
+                if ( ! $passed ) {
+                    unset( $promotions[ $promo_id ] );
+                }
+            }
+            // Transform promotions to the correct format ready for output.
+            $promotions = self::format_promotions( $promotions );
+        }
+
+        /**
+         * Addon page view.
+         *
+         * @uses $addons
+         * @uses $search
+         * @uses $sections
+         * @uses $theme
+         * @uses $current_section
+         */
+        include_once dirname( __FILE__ ) . '/views/html-admin-page-addons.php';
+    }
+
+    /**
+     * Install WooCommerce Services from Extensions screens.
+     */
+    public static function install_woocommerce_services_addon() {
+        check_admin_referer( 'install-addon_woocommerce-services' );
+
+        $services_plugin_id = 'woocommerce-services';
+        $services_plugin    = array(
+            'name'      => __( 'WooCommerce Services', 'woocommerce' ),
+            'repo-slug' => 'woocommerce-services',
+        );
+
+        WC_Install::background_installer( $services_plugin_id, $services_plugin );
+
+        wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) );
+        exit;
+    }
+
+    /**
+     * Install WooCommerce Payments from the Extensions screens.
+     *
+     * @param string $section Optional. Extenstions tab.
+     *
+     * @return void
+     */
+    public static function install_woocommerce_payments_addon( $section = '_featured' ) {
+        check_admin_referer( 'install-addon_woocommerce-payments' );
+
+        $wcpay_plugin_id = 'woocommerce-payments';
+        $wcpay_plugin    = array(
+            'name'      => __( 'WooCommerce Payments', 'woocommerce' ),
+            'repo-slug' => 'woocommerce-payments',
+        );
+
+        WC_Install::background_installer( $wcpay_plugin_id, $wcpay_plugin );
+
+        do_action( 'woocommerce_addon_installed', $wcpay_plugin_id, $section );
+
+        wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) );
+        exit;
+    }
+
+    /**
+     * We're displaying page=wc-addons and page=wc-addons&section=helper as two separate pages.
+     * When we're on those pages, add body classes to distinguishe them.
+     *
+     * @param string $admin_body_class Unfiltered body class.
+     *
+     * @return string Body class with added class for Marketplace or My Subscriptions page.
+     */
+    public static function filter_admin_body_classes( string $admin_body_class = '' ): string {
+        if ( isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
+            return " $admin_body_class woocommerce-page-wc-subscriptions ";
+        }
+
+        return " $admin_body_class woocommerce-page-wc-marketplace ";
+    }
+
+    /**
+     * Determine which class should be used for a rating star:
+     * - golden
+     * - half-filled (50/50 golden and gray)
+     * - gray
+     *
+     * Consider ratings from 3.0 to 4.0 as an example
+     * 3.0 will produce 3 stars
+     * 3.1 to 3.5 will produce 3 stars and a half star
+     * 3.6 to 4.0 will product 4 stars
+     *
+     * @param float $rating Rating of a product.
+     * @param int   $index  Index of a star in a row.
+     *
+     * @return string CSS class to use.
+     */
+    public static function get_star_class( $rating, $index ) {
+        if ( $rating >= $index ) {
+            // Rating more that current star to show.
+            return 'fill';
+        } elseif (
+            abs( $index - 1 - floor( $rating ) ) < 0.0000001 &&
+            0 < ( $rating - floor( $rating ) )
+        ) {
+            // For rating more than x.0 and less than x.5 or equal it will show a half star.
+            return 50 >= floor( ( $rating - floor( $rating ) ) * 100 )
+                ? 'half-fill'
+                : 'fill';
+        }
+
+        // Don't show a golden star otherwise.
+        return 'no-fill';
+    }
+
+    /**
+     * Take an action object and return the URL based on properties of the action.
+     *
+     * @param object $action Action object.
+     * @return string URL.
+     */
+    public static function get_action_url( $action ): string {
+        if ( ! isset( $action->url ) ) {
+            return '';
+        }
+
+        if ( isset( $action->url_is_admin_query ) && $action->url_is_admin_query ) {
+            return wc_admin_url( $action->url );
+        }
+
+        if ( isset( $action->url_is_admin_nonce_query ) && $action->url_is_admin_nonce_query ) {
+            if ( empty( $action->nonce ) ) {
+                return '';
+            }
+            return wp_nonce_url(
+                admin_url( $action->url ),
+                $action->nonce
+            );
+        }
+
+        return $action->url;
+    }
+
+    /**
+     * Format the promotion data ready for display, ie fetch locales and actions.
+     *
+     * @param array $promotions Array of promotoin objects.
+     * @return array Array of formatted promotions ready for output.
+     */
+    public static function format_promotions( array $promotions ): array {
+        $formatted_promotions = array();
+        foreach ( $promotions as $promotion ) {
+            // Get the matching locale or fall back to en-US.
+            $locale = PromotionRuleEngine\SpecRunner::get_locale( $promotion->locales );
+            if ( null === $locale ) {
+                continue;
+            }
+
+            $promotion_actions = array();
+            if ( ! empty( $promotion->actions ) ) {
+                foreach ( $promotion->actions as $action ) {
+                    $action_locale = PromotionRuleEngine\SpecRunner::get_action_locale( $action->locales );
+                    $url           = self::get_action_url( $action );
+
+                    $promotion_actions[] = array(
+                        'name'    => $action->name,
+                        'label'   => $action_locale->label,
+                        'url'     => $url,
+                        'primary' => isset( $action->is_primary ) ? $action->is_primary : false,
+                    );
+                }
+            }
+
+            $formatted_promotions[] = array(
+                'title'       => $locale->title,
+                'description' => $locale->description,
+                'image'       => ( 'http' === substr( $locale->image, 0, 4 ) ) ? $locale->image : WC()->plugin_url() . $locale->image,
+                'image_alt'   => $locale->image_alt,
+                'actions'     => $promotion_actions,
+            );
+        }
+        return $formatted_promotions;
+    }
+
+    /**
+     * Map data from different endpoints to a universal format
+     *
+     * Search and featured products has a slightly different products' field names.
+     * Mapping converts different data structures into a universal one for further processing.
+     *
+     * @param mixed $data Product Card Data.
+     *
+     * @return object Converted data.
+     */
+    public static function map_product_card_data( $data ) {
+        $mapped = (object) null;
+
+        $type = $data->type ?? null;
+
+        // Icon.
+        $mapped->icon = $data->icon ?? null;
+        if ( null === $mapped->icon && 'banner' === $type ) {
+            // For product-related banners icon is a product's image.
+            $mapped->icon = $data->image ?? null;
+        }
+
+        // URL.
+        $mapped->url = $data->link ?? null;
+        if ( empty( $mapped->url ) ) {
+            $mapped->url = $data->url ?? null;
+        }
+
+        // Title.
+        $mapped->title = $data->title ?? null;
+
+        // Vendor Name.
+        $mapped->vendor_name = $data->vendor_name ?? null;
+        if ( empty( $mapped->vendor_name ) ) {
+            $mapped->vendor_name = $data->vendorName ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        }
+
+        // Vendor URL.
+        $mapped->vendor_url = $data->vendor_url ?? null;
+        if ( empty( $mapped->vendor_url ) ) {
+            $mapped->vendor_url = $data->vendorUrl ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        }
+
+        // Description.
+        $mapped->description = $data->excerpt ?? null;
+        if ( empty( $mapped->description ) ) {
+            $mapped->description = $data->description ?? null;
+        }
+
+        $has_currency = ! empty( $data->currency ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+
+        // Is Free.
+        if ( $has_currency ) {
+            $mapped->is_free = 0 === (int) $data->price;
+        } else {
+            $mapped->is_free = '&#36;0.00' === $data->price;
+        }
+
+        // Price.
+        if ( $has_currency ) {
+            $mapped->price = wc_price( $data->price, array( 'currency' => $data->currency ) );
+        } else {
+            $mapped->price = $data->price;
+        }
+
+        // Price suffix, e.g. "per month".
+        $mapped->price_suffix = $data->price_suffix ?? null;
+
+        // Rating.
+        $mapped->rating = $data->rating ?? null;
+        if ( null === $mapped->rating ) {
+            $mapped->rating = $data->averageRating ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        }
+
+        // Reviews Count.
+        $mapped->reviews_count = $data->reviews_count ?? null;
+        if ( null === $mapped->reviews_count ) {
+            $mapped->reviews_count = $data->reviewsCount ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        }
+        // Featured & Promoted product card.
+        // Label.
+        $mapped->label = $data->label ?? null;
+        // Primary color.
+        $mapped->primary_color = $data->primary_color ?? null;
+        // Text color.
+        $mapped->text_color = $data->text_color ?? null;
+        // Button text.
+        $mapped->button = $data->button ?? null;
+
+        return $mapped;
+    }
+
+    /**
+     * Render a product card
+     *
+     * There's difference in data structure (e.g. field names) between endpoints such as search and
+     * featured. Inner mapping helps to use universal field names for further work.
+     *
+     * @param mixed  $data       Product data.
+     * @param string $block_type Block type that's different from the default product card, e.g. a banner.
+     *
+     * @return void
+     */
+    public static function render_product_card( $data, $block_type = null ) {
+        $mapped      = self::map_product_card_data( $data );
+        $product_url = self::add_in_app_purchase_url_params( $mapped->url );
+        $class_names = array( 'product' );
+        // Specify a class name according to $block_type (if it's specified).
+        if ( null !== $block_type ) {
+            $class_names[] = 'addons-product-' . $block_type;
+        }
+
+        $product_details_classes = 'product-details';
+        if ( 'banner' === $block_type ) {
+            $product_details_classes .= ' addon-product-banner-details';
+        }
+
+        if ( isset( $mapped->label ) && 'promoted' === $mapped->label ) {
+            $product_details_classes .= ' promoted';
+        } elseif ( isset( $mapped->label ) && 'featured' === $mapped->label ) {
+            $product_details_classes .= ' featured';
+        }
+
+        if ( 'promoted' === $mapped->label
+            && ! empty( $mapped->primary_color )
+            && ! empty( $mapped->text_color )
+            && ! empty( $mapped->button ) ) {
+            // Promoted product card.
+            ?>
 			<li class="product">
 				<div class="<?php echo esc_attr( $product_details_classes ); ?>" style="border-top: 5px  solid <?php echo esc_html( $mapped->primary_color ); ?>;">
 					<span class="label promoted"><?php esc_attr_e( 'Promoted', 'woocommerce' ); ?></span>
@@ -1387,9 +1387,9 @@ 
 				</div>
 			</li>
 			<?php
-		} else {
-			// Normal or "featured" product card.
-			?>
+        } else {
+            // Normal or "featured" product card.
+            ?>
 			<li class="<?php echo esc_attr( implode( ' ', $class_names ) ); ?>">
 				<div class="<?php echo esc_attr( $product_details_classes ); ?>">
 					<div class="product-text-container">
@@ -1402,26 +1402,26 @@ 
 						<?php if ( ! empty( $mapped->vendor_name ) && ! empty( $mapped->vendor_url ) ) : ?>
 							<div class="product-developed-by">
 								<?php
-								$vendor_url = add_query_arg(
-									array(
-										'utm_source'   => 'extensionsscreen',
-										'utm_medium'   => 'product',
-										'utm_campaign' => 'wcaddons',
-										'utm_content'  => 'devpartner',
-									),
-									$mapped->vendor_url
-								);
-
-								printf(
-								/* translators: %s vendor link */
-									esc_html__( 'Developed by %s', 'woocommerce' ),
-									sprintf(
-										'<a class="product-vendor-link" href="%1$s" target="_blank">%2$s</a>',
-										esc_url_raw( $vendor_url ),
-										esc_html( $mapped->vendor_name )
-									)
-								);
-								?>
+                                $vendor_url = add_query_arg(
+                                    array(
+                                        'utm_source'   => 'extensionsscreen',
+                                        'utm_medium'   => 'product',
+                                        'utm_campaign' => 'wcaddons',
+                                        'utm_content'  => 'devpartner',
+                                    ),
+                                    $mapped->vendor_url
+                                );
+
+                                printf(
+                                /* translators: %s vendor link */
+                                    esc_html__( 'Developed by %s', 'woocommerce' ),
+                                    sprintf(
+                                        '<a class="product-vendor-link" href="%1$s" target="_blank">%2$s</a>',
+                                        esc_url_raw( $vendor_url ),
+                                        esc_html( $mapped->vendor_name )
+                                    )
+                                );
+                                ?>
 							</div>
 						<?php endif; ?>
 						<p><?php echo wp_kses_post( $mapped->description ); ?></p>
@@ -1441,25 +1441,25 @@ 
 							<?php else : ?>
 								<span class="price">
 									<?php
-									echo wp_kses(
-										$mapped->price,
-										array(
-											'span' => array(
-												'class' => array(),
-											),
-											'bdi'  => array(),
-										)
-									);
-									?>
+                                    echo wp_kses(
+                                        $mapped->price,
+                                        array(
+                                            'span' => array(
+                                                'class' => array(),
+                                            ),
+                                            'bdi'  => array(),
+                                        )
+                                    );
+                                    ?>
 								</span>
 								<span class="price-suffix">
 									<?php
-									$price_suffix = __( 'per year', 'woocommerce' );
-									if ( ! empty( $mapped->price_suffix ) ) {
-										$price_suffix = $mapped->price_suffix;
-									}
-									echo esc_html( $price_suffix );
-									?>
+                                    $price_suffix = __( 'per year', 'woocommerce' );
+                                    if ( ! empty( $mapped->price_suffix ) ) {
+                                        $price_suffix = $mapped->price_suffix;
+                                    }
+                                    echo esc_html( $price_suffix );
+                                    ?>
 								</span>
 							<?php endif; ?>
 						</div>
@@ -1480,6 +1480,6 @@ 
 				</div>
 			</li>
 			<?php
-		}
-	}
+        }
+    }
 }

Spacing +341 added lines, -341 removed lines

@@ -9,7 +9,7 @@ 
 use Automattic\Jetpack\Constants;
 use Automattic\WooCommerce\Admin\RemoteInboxNotifications as PromotionRuleEngine;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,12 +26,12 @@ 
 	 * @return array of objects
 	 */
 	public static function get_featured() {
-		$featured = get_transient( 'wc_addons_featured_2' );
-		if ( false === $featured ) {
+		$featured = get_transient('wc_addons_featured_2');
+		if (false === $featured) {
 			$headers = array();
-			$auth    = WC_Helper_Options::get( 'auth' );
+			$auth    = WC_Helper_Options::get('auth');
 
-			if ( ! empty( $auth['access_token'] ) ) {
+			if (!empty($auth['access_token'])) {
 				$headers['Authorization'] = 'Bearer ' . $auth['access_token'];
 			}
 
@@ -42,16 +42,16 @@ 
 				)
 			);
 
-			if ( ! is_wp_error( $raw_featured ) ) {
-				$featured = json_decode( wp_remote_retrieve_body( $raw_featured ) );
-				if ( $featured ) {
-					set_transient( 'wc_addons_featured_2', $featured, DAY_IN_SECONDS );
+			if (!is_wp_error($raw_featured)) {
+				$featured = json_decode(wp_remote_retrieve_body($raw_featured));
+				if ($featured) {
+					set_transient('wc_addons_featured_2', $featured, DAY_IN_SECONDS);
 				}
 			}
 		}
 
-		if ( is_object( $featured ) ) {
-			self::output_featured_sections( $featured->sections );
+		if (is_object($featured)) {
+			self::output_featured_sections($featured->sections);
 			return $featured;
 		}
 	}
@@ -62,19 +62,19 @@ 
 	 * @return void
 	 */
 	public static function render_featured() {
-		$featured = get_transient( 'wc_addons_featured' );
-		if ( false === $featured ) {
+		$featured = get_transient('wc_addons_featured');
+		if (false === $featured) {
 			$headers = array();
-			$auth    = WC_Helper_Options::get( 'auth' );
+			$auth    = WC_Helper_Options::get('auth');
 
-			if ( ! empty( $auth['access_token'] ) ) {
+			if (!empty($auth['access_token'])) {
 				$headers['Authorization'] = 'Bearer ' . $auth['access_token'];
 			}
 
 			$parameter_string = '';
 			$country          = WC()->countries->get_base_country();
-			if ( ! empty( $country ) ) {
-				$parameter_string = '?' . http_build_query( array( 'country' => $country ) );
+			if (!empty($country)) {
+				$parameter_string = '?' . http_build_query(array('country' => $country));
 			}
 
 			// Important: WCCOM Extensions API v2.0 is used.
@@ -85,21 +85,21 @@ 
 				)
 			);
 
-			if ( is_wp_error( $raw_featured ) ) {
-				do_action( 'woocommerce_page_wc-addons_connection_error', $raw_featured->get_error_message() );
+			if (is_wp_error($raw_featured)) {
+				do_action('woocommerce_page_wc-addons_connection_error', $raw_featured->get_error_message());
 
-				$message = self::is_ssl_error( $raw_featured->get_error_message() )
-					? __( 'We encountered an SSL error. Please ensure your site supports TLS version 1.2 or above.', 'woocommerce' )
+				$message = self::is_ssl_error($raw_featured->get_error_message())
+					? __('We encountered an SSL error. Please ensure your site supports TLS version 1.2 or above.', 'woocommerce')
 					: $raw_featured->get_error_message();
 
-				self::output_empty( $message );
+				self::output_empty($message);
 
 				return;
 			}
 
-			$response_code = (int) wp_remote_retrieve_response_code( $raw_featured );
-			if ( 200 !== $response_code ) {
-				do_action( 'woocommerce_page_wc-addons_connection_error', $response_code );
+			$response_code = (int) wp_remote_retrieve_response_code($raw_featured);
+			if (200 !== $response_code) {
+				do_action('woocommerce_page_wc-addons_connection_error', $response_code);
 
 				/* translators: %d: HTTP error code. */
 				$message = sprintf(
@@ -113,26 +113,26 @@ 
 					$response_code
 				);
 
-				self::output_empty( $message );
+				self::output_empty($message);
 
 				return;
 			}
 
-			$featured      = json_decode( wp_remote_retrieve_body( $raw_featured ) );
-			if ( empty( $featured ) || ! is_array( $featured ) ) {
-				do_action( 'woocommerce_page_wc-addons_connection_error', 'Empty or malformed response' );
-				$message = __( 'Our request to the featured API got a malformed response.', 'woocommerce' );
-				self::output_empty( $message );
+			$featured = json_decode(wp_remote_retrieve_body($raw_featured));
+			if (empty($featured) || !is_array($featured)) {
+				do_action('woocommerce_page_wc-addons_connection_error', 'Empty or malformed response');
+				$message = __('Our request to the featured API got a malformed response.', 'woocommerce');
+				self::output_empty($message);
 
 				return;
 			}
 
-			if ( $featured ) {
-				set_transient( 'wc_addons_featured', $featured, DAY_IN_SECONDS );
+			if ($featured) {
+				set_transient('wc_addons_featured', $featured, DAY_IN_SECONDS);
 			}
 		}
 
-		self::output_featured( $featured );
+		self::output_featured($featured);
 	}
 
 	/**
@@ -142,8 +142,8 @@ 
 	 *
 	 * @return bool True if SSL error, false otherwise
 	 */
-	public static function is_ssl_error( $error_message ) {
-		return false !== stripos( $error_message, 'cURL error 35' );
+	public static function is_ssl_error($error_message) {
+		return false !== stripos($error_message, 'cURL error 35');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 *
 	 * @return string url parameter string
 	 */
-	public static function build_parameter_string( $category, $term, $country ) {
+	public static function build_parameter_string($category, $term, $country) {
 
 		$parameters = array(
 			'category' => $category,
@@ -163,7 +163,7 @@ 
 			'country'  => $country,
 		);
 
-		return '?' . http_build_query( $parameters );
+		return '?' . http_build_query($parameters);
 	}
 
 	/**
@@ -175,46 +175,46 @@ 
 	 *
 	 * @return object|WP_Error  Object with products and promotions properties, or WP_Error
 	 */
-	public static function get_extension_data( $category, $term, $country ) {
-		$parameters = self::build_parameter_string( $category, $term, $country );
+	public static function get_extension_data($category, $term, $country) {
+		$parameters = self::build_parameter_string($category, $term, $country);
 
 		$headers = array();
-		$auth    = WC_Helper_Options::get( 'auth' );
+		$auth    = WC_Helper_Options::get('auth');
 
-		if ( ! empty( $auth['access_token'] ) ) {
+		if (!empty($auth['access_token'])) {
 			$headers['Authorization'] = 'Bearer ' . $auth['access_token'];
 		}
 
 		$raw_extensions = wp_safe_remote_get(
 			'https://woocommerce.com/wp-json/wccom-extensions/1.0/search' . $parameters,
-			array( 'headers' => $headers )
+			array('headers' => $headers)
 		);
 
-		if ( is_wp_error( $raw_extensions ) ) {
-			do_action( 'woocommerce_page_wc-addons_connection_error', $raw_extensions->get_error_message() );
+		if (is_wp_error($raw_extensions)) {
+			do_action('woocommerce_page_wc-addons_connection_error', $raw_extensions->get_error_message());
 			return $raw_extensions;
 		}
 
-		$response_code = (int) wp_remote_retrieve_response_code( $raw_extensions );
-		if ( 200 !== $response_code ) {
-			do_action( 'woocommerce_page_wc-addons_connection_error', $response_code );
+		$response_code = (int) wp_remote_retrieve_response_code($raw_extensions);
+		if (200 !== $response_code) {
+			do_action('woocommerce_page_wc-addons_connection_error', $response_code);
 			return new WP_Error(
 				'error',
 				sprintf(
 					esc_html(
 						/* translators: Error code  */
-						__( 'Our request to the search API got response code %s.', 'woocommerce' )
+						__('Our request to the search API got response code %s.', 'woocommerce')
 					),
 					$response_code
 				)
 			);
 		}
 
-		$addons = json_decode( wp_remote_retrieve_body( $raw_extensions ) );
+		$addons = json_decode(wp_remote_retrieve_body($raw_extensions));
 
-		if ( ! is_object( $addons ) || ! isset( $addons->products ) ) {
-			do_action( 'woocommerce_page_wc-addons_connection_error', 'Empty or malformed response' );
-			return new WP_Error( 'error', __( 'Our request to the search API got a malformed response.', 'woocommerce' ) );
+		if (!is_object($addons) || !isset($addons->products)) {
+			do_action('woocommerce_page_wc-addons_connection_error', 'Empty or malformed response');
+			return new WP_Error('error', __('Our request to the search API got a malformed response.', 'woocommerce'));
 		}
 
 		return $addons;
@@ -226,19 +226,19 @@ 
 	 * @return array of objects
 	 */
 	public static function get_sections() {
-		$addon_sections = get_transient( 'wc_addons_sections' );
-		if ( false === ( $addon_sections ) ) {
+		$addon_sections = get_transient('wc_addons_sections');
+		if (false === ($addon_sections)) {
 			$raw_sections = wp_safe_remote_get(
 				'https://woocommerce.com/wp-json/wccom-extensions/1.0/categories'
 			);
-			if ( ! is_wp_error( $raw_sections ) ) {
-				$addon_sections = json_decode( wp_remote_retrieve_body( $raw_sections ) );
-				if ( $addon_sections ) {
-					set_transient( 'wc_addons_sections', $addon_sections, WEEK_IN_SECONDS );
+			if (!is_wp_error($raw_sections)) {
+				$addon_sections = json_decode(wp_remote_retrieve_body($raw_sections));
+				if ($addon_sections) {
+					set_transient('wc_addons_sections', $addon_sections, WEEK_IN_SECONDS);
 				}
 			}
 		}
-		return apply_filters( 'woocommerce_addons_sections', $addon_sections );
+		return apply_filters('woocommerce_addons_sections', $addon_sections);
 	}
 
 	/**
@@ -248,10 +248,10 @@ 
 	 *
 	 * @return object|bool
 	 */
-	public static function get_section( $section_id ) {
+	public static function get_section($section_id) {
 		$sections = self::get_sections();
-		if ( isset( $sections[ $section_id ] ) ) {
-			return $sections[ $section_id ];
+		if (isset($sections[$section_id])) {
+			return $sections[$section_id];
 		}
 		return false;
 	}
@@ -266,26 +266,26 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_section_data( $section_id ) {
-		$section      = self::get_section( $section_id );
+	public static function get_section_data($section_id) {
+		$section      = self::get_section($section_id);
 		$section_data = '';
 
-		if ( ! empty( $section->endpoint ) ) {
-			$section_data = get_transient( 'wc_addons_section_' . $section_id );
-			if ( false === $section_data ) {
-				$raw_section = wp_safe_remote_get( esc_url_raw( $section->endpoint ) );
+		if (!empty($section->endpoint)) {
+			$section_data = get_transient('wc_addons_section_' . $section_id);
+			if (false === $section_data) {
+				$raw_section = wp_safe_remote_get(esc_url_raw($section->endpoint));
 
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+				if (!is_wp_error($raw_section)) {
+					$section_data = json_decode(wp_remote_retrieve_body($raw_section));
 
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wc_addons_section_' . $section_id, $section_data, WEEK_IN_SECONDS );
+					if (!empty($section_data->products)) {
+						set_transient('wc_addons_section_' . $section_id, $section_data, WEEK_IN_SECONDS);
 					}
 				}
 			}
 		}
 
-		return apply_filters( 'woocommerce_addons_section_data', $section_data->products, $section_id );
+		return apply_filters('woocommerce_addons_section_data', $section_data->products, $section_id);
 	}
 
 	/**
@@ -294,22 +294,22 @@ 
 	 * @deprecated 5.9.0 No longer used in In-App Marketplace
 	 */
 	public static function output_storefront_button() {
-		$template   = get_option( 'template' );
-		$stylesheet = get_option( 'stylesheet' );
+		$template   = get_option('template');
+		$stylesheet = get_option('stylesheet');
 
-		if ( 'storefront' === $template ) {
-			if ( 'storefront' === $stylesheet ) {
+		if ('storefront' === $template) {
+			if ('storefront' === $stylesheet) {
 				$url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
-				$text        = __( 'Need a fresh look? Try Storefront child themes', 'woocommerce' );
+				$text        = __('Need a fresh look? Try Storefront child themes', 'woocommerce');
 				$utm_content = 'nostorefrontchildtheme';
 			} else {
 				$url         = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/';
-				$text        = __( 'View more Storefront child themes', 'woocommerce' );
+				$text        = __('View more Storefront child themes', 'woocommerce');
 				$utm_content = 'hasstorefrontchildtheme';
 			}
 		} else {
 			$url         = 'https://woocommerce.com/storefront/';
-			$text        = __( 'Need a theme? Try Storefront', 'woocommerce' );
+			$text        = __('Need a theme? Try Storefront', 'woocommerce');
 			$utm_content = 'nostorefront';
 		}
 
@@ -323,7 +323,7 @@ 
 			$url
 		);
 
-		echo '<a href="' . esc_url( $url ) . '" class="add-new-h2">' . esc_html( $text ) . '</a>' . "\n";
+		echo '<a href="' . esc_url($url) . '" class="add-new-h2">' . esc_html($text) . '</a>' . "\n";
 	}
 
 	/**
@@ -333,21 +333,21 @@ 
 	 *
 	 * @param object $block Banner data.
 	 */
-	public static function output_banner_block( $block ) {
+	public static function output_banner_block($block) {
 		?>
 		<div class="addons-banner-block">
-			<h1><?php echo esc_html( $block->title ); ?></h1>
-			<p><?php echo esc_html( $block->description ); ?></p>
+			<h1><?php echo esc_html($block->title); ?></h1>
+			<p><?php echo esc_html($block->description); ?></p>
 			<div class="addons-banner-block-items">
-				<?php foreach ( $block->items as $item ) : ?>
-					<?php if ( self::show_extension( $item ) ) : ?>
+				<?php foreach ($block->items as $item) : ?>
+					<?php if (self::show_extension($item)) : ?>
 						<div class="addons-banner-block-item">
 							<div class="addons-banner-block-item-icon">
-								<img class="addons-img" src="<?php echo esc_url( $item->image ); ?>" />
+								<img class="addons-img" src="<?php echo esc_url($item->image); ?>" />
 							</div>
 							<div class="addons-banner-block-item-content">
-								<h3><?php echo esc_html( $item->title ); ?></h3>
-								<p><?php echo esc_html( $item->description ); ?></p>
+								<h3><?php echo esc_html($item->title); ?></h3>
+								<p><?php echo esc_html($item->description); ?></p>
 								<?php
 									self::output_button(
 										$item->href,
@@ -372,13 +372,13 @@ 
 	 *
 	 * @param object $block Column data.
 	 */
-	public static function output_column( $block ) {
-		if ( isset( $block->container ) && 'column_container_start' === $block->container ) {
+	public static function output_column($block) {
+		if (isset($block->container) && 'column_container_start' === $block->container) {
 			?>
 			<div class="addons-column-section">
 			<?php
 		}
-		if ( 'column_start' === $block->module ) {
+		if ('column_start' === $block->module) {
 			?>
 			<div class="addons-column">
 			<?php
@@ -387,7 +387,7 @@ 
 			</div>
 			<?php
 		}
-		if ( isset( $block->container ) && 'column_container_end' === $block->container ) {
+		if (isset($block->container) && 'column_container_end' === $block->container) {
 			?>
 			</div>
 			<?php
@@ -401,19 +401,19 @@ 
 	 *
 	 * @param object $block Column block data.
 	 */
-	public static function output_column_block( $block ) {
+	public static function output_column_block($block) {
 		?>
 		<div class="addons-column-block">
-			<h1><?php echo esc_html( $block->title ); ?></h1>
-			<p><?php echo esc_html( $block->description ); ?></p>
-			<?php foreach ( $block->items as $item ) : ?>
-				<?php if ( self::show_extension( $item ) ) : ?>
+			<h1><?php echo esc_html($block->title); ?></h1>
+			<p><?php echo esc_html($block->description); ?></p>
+			<?php foreach ($block->items as $item) : ?>
+				<?php if (self::show_extension($item)) : ?>
 					<div class="addons-column-block-item">
 						<div class="addons-column-block-item-icon">
-							<img class="addons-img" src="<?php echo esc_url( $item->image ); ?>" />
+							<img class="addons-img" src="<?php echo esc_url($item->image); ?>" />
 						</div>
 						<div class="addons-column-block-item-content">
-							<h2><?php echo esc_html( $item->title ); ?></h2>
+							<h2><?php echo esc_html($item->title); ?></h2>
 							<?php
 								self::output_button(
 									$item->href,
@@ -422,7 +422,7 @@ 
 									$item->plugin
 								);
 							?>
-							<p><?php echo esc_html( $item->description ); ?></p>
+							<p><?php echo esc_html($item->description); ?></p>
 						</div>
 					</div>
 				<?php endif; ?>
@@ -439,15 +439,15 @@ 
 	 *
 	 * @param object $block Block data.
 	 */
-	public static function output_small_light_block( $block ) {
+	public static function output_small_light_block($block) {
 		?>
 		<div class="addons-small-light-block">
-			<img class="addons-img" src="<?php echo esc_url( $block->image ); ?>" />
+			<img class="addons-img" src="<?php echo esc_url($block->image); ?>" />
 			<div class="addons-small-light-block-content">
-				<h1><?php echo esc_html( $block->title ); ?></h1>
-				<p><?php echo esc_html( $block->description ); ?></p>
+				<h1><?php echo esc_html($block->title); ?></h1>
+				<p><?php echo esc_html($block->description); ?></p>
 				<div class="addons-small-light-block-buttons">
-					<?php foreach ( $block->buttons as $button ) : ?>
+					<?php foreach ($block->buttons as $button) : ?>
 						<?php
 							self::output_button(
 								$button->href,
@@ -469,17 +469,17 @@ 
 	 *
 	 * @param object $block Block data.
 	 */
-	public static function output_small_dark_block( $block ) {
+	public static function output_small_dark_block($block) {
 		?>
 		<div class="addons-small-dark-block">
-			<h1><?php echo esc_html( $block->title ); ?></h1>
-			<p><?php echo esc_html( $block->description ); ?></p>
+			<h1><?php echo esc_html($block->title); ?></h1>
+			<p><?php echo esc_html($block->description); ?></p>
 			<div class="addons-small-dark-items">
-				<?php foreach ( $block->items as $item ) : ?>
+				<?php foreach ($block->items as $item) : ?>
 					<div class="addons-small-dark-item">
-						<?php if ( ! empty( $item->image ) ) : ?>
+						<?php if (!empty($item->image)) : ?>
 							<div class="addons-small-dark-item-icon">
-								<img class="addons-img" src="<?php echo esc_url( $item->image ); ?>" />
+								<img class="addons-img" src="<?php echo esc_url($item->image); ?>" />
 							</div>
 						<?php endif; ?>
 						<?php
@@ -503,15 +503,15 @@ 
 	 *
 	 * @param object $block Block data.
 	 */
-	public static function output_wcs_banner_block( $block = array() ) {
-		$is_active = is_plugin_active( 'woocommerce-services/woocommerce-services.php' );
+	public static function output_wcs_banner_block($block = array()) {
+		$is_active = is_plugin_active('woocommerce-services/woocommerce-services.php');
 		$location  = wc_get_base_location();
 
 		if (
-			! in_array( $location['country'], array( 'US' ), true ) ||
+			!in_array($location['country'], array('US'), true) ||
 			$is_active ||
-			! current_user_can( 'install_plugins' ) ||
-			! current_user_can( 'activate_plugins' )
+			!current_user_can('install_plugins') ||
+			!current_user_can('activate_plugins')
 		) {
 			return;
 		}
@@ -527,15 +527,15 @@ 
 
 		$defaults = array(
 			'image'       => WC()->plugin_url() . '/assets/images/wcs-extensions-banner-3x.jpg',
-			'image_alt'   => __( 'WooCommerce Shipping', 'woocommerce' ),
-			'title'       => __( 'Save time and money with WooCommerce Shipping', 'woocommerce' ),
-			'description' => __( 'Print discounted USPS and DHL labels straight from your WooCommerce dashboard and save on shipping.', 'woocommerce' ),
-			'button'      => __( 'Free - Install now', 'woocommerce' ),
+			'image_alt'   => __('WooCommerce Shipping', 'woocommerce'),
+			'title'       => __('Save time and money with WooCommerce Shipping', 'woocommerce'),
+			'description' => __('Print discounted USPS and DHL labels straight from your WooCommerce dashboard and save on shipping.', 'woocommerce'),
+			'button'      => __('Free - Install now', 'woocommerce'),
 			'href'        => $button_url,
 			'logos'       => array(),
 		);
 
-		switch ( $location['country'] ) {
+		switch ($location['country']) {
 			case 'US':
 				$local_defaults = array(
 					'logos' => array_merge(
@@ -557,26 +557,26 @@ 
 				$local_defaults = array();
 		}
 
-		$block_data = array_merge( $defaults, $local_defaults, $block );
+		$block_data = array_merge($defaults, $local_defaults, $block);
 		?>
 		<div class="addons-wcs-banner-block">
 			<div class="addons-wcs-banner-block-image is-full-image">
 				<img
 					class="addons-img"
-					src="<?php echo esc_url( $block_data['image'] ); ?>"
-					alt="<?php echo esc_attr( $block_data['image_alt'] ); ?>"
+					src="<?php echo esc_url($block_data['image']); ?>"
+					alt="<?php echo esc_attr($block_data['image_alt']); ?>"
 				/>
 			</div>
 			<div class="addons-wcs-banner-block-content">
-				<h1><?php echo esc_html( $block_data['title'] ); ?></h1>
-				<p><?php echo esc_html( $block_data['description'] ); ?></p>
+				<h1><?php echo esc_html($block_data['title']); ?></h1>
+				<p><?php echo esc_html($block_data['description']); ?></p>
 				<ul class="wcs-logos-container">
-					<?php foreach ( $block_data['logos'] as $logo ) : ?>
+					<?php foreach ($block_data['logos'] as $logo) : ?>
 						<li>
 							<img
-								alt="<?php echo esc_attr( $logo['alt'] ); ?>"
+								alt="<?php echo esc_attr($logo['alt']); ?>"
 								class="wcs-service-logo"
-								src="<?php echo esc_url( $logo['link'] ); ?>"
+								src="<?php echo esc_url($logo['link']); ?>"
 							>
 						</li>
 					<?php endforeach; ?>
@@ -600,15 +600,15 @@ 
 	 *
 	 * @param object $block Block data.
 	 */
-	public static function output_wcpay_banner_block( $block = array() ) {
-		$is_active = is_plugin_active( 'woocommerce-payments/woocommerce-payments.php' );
+	public static function output_wcpay_banner_block($block = array()) {
+		$is_active = is_plugin_active('woocommerce-payments/woocommerce-payments.php');
 		$location  = wc_get_base_location();
 
 		if (
-			! in_array( $location['country'], array( 'US' ), true ) ||
+			!in_array($location['country'], array('US'), true) ||
 			$is_active ||
-			! current_user_can( 'install_plugins' ) ||
-			! current_user_can( 'activate_plugins' )
+			!current_user_can('install_plugins') ||
+			!current_user_can('activate_plugins')
 		) {
 			return;
 		}
@@ -624,27 +624,27 @@ 
 
 		$defaults = array(
 			'image'       => WC()->plugin_url() . '/assets/images/wcpayments-icon-secure.png',
-			'image_alt'   => __( 'WooCommerce Payments', 'woocommerce' ),
-			'title'       => __( 'Payments made simple, with no monthly fees &mdash; exclusively for WooCommerce stores.', 'woocommerce' ),
-			'description' => __( 'Securely accept cards in your store. See payments, track cash flow into your bank account, and stay on top of disputes – right from your dashboard.', 'woocommerce' ),
-			'button'      => __( 'Free - Install now', 'woocommerce' ),
+			'image_alt'   => __('WooCommerce Payments', 'woocommerce'),
+			'title'       => __('Payments made simple, with no monthly fees &mdash; exclusively for WooCommerce stores.', 'woocommerce'),
+			'description' => __('Securely accept cards in your store. See payments, track cash flow into your bank account, and stay on top of disputes – right from your dashboard.', 'woocommerce'),
+			'button'      => __('Free - Install now', 'woocommerce'),
 			'href'        => $button_url,
 			'logos'       => array(),
 		);
 
-		$block_data = array_merge( $defaults, $block );
+		$block_data = array_merge($defaults, $block);
 		?>
 		<div class="addons-wcs-banner-block">
 			<div class="addons-wcs-banner-block-image">
 				<img
 					class="addons-img"
-					src="<?php echo esc_url( $block_data['image'] ); ?>"
-					alt="<?php echo esc_attr( $block_data['image_alt'] ); ?>"
+					src="<?php echo esc_url($block_data['image']); ?>"
+					alt="<?php echo esc_attr($block_data['image_alt']); ?>"
 				/>
 			</div>
 			<div class="addons-wcs-banner-block-content">
-				<h1><?php echo esc_html( $block_data['title'] ); ?></h1>
-				<p><?php echo esc_html( $block_data['description'] ); ?></p>
+				<h1><?php echo esc_html($block_data['title']); ?></h1>
+				<p><?php echo esc_html($block_data['description']); ?></p>
 				<?php
 					self::output_button(
 						$block_data['href'],
@@ -664,23 +664,23 @@ 
 	 * @param array $promotion Array of promotion block data.
 	 * @return void
 	 */
-	public static function output_search_promotion_block( array $promotion ) {
+	public static function output_search_promotion_block(array $promotion) {
 		?>
 		<div class="addons-wcs-banner-block">
 			<div class="addons-wcs-banner-block-image">
 				<img
 					class="addons-img"
-					src="<?php echo esc_url( $promotion['image'] ); ?>"
-					alt="<?php echo esc_attr( $promotion['image_alt'] ); ?>"
+					src="<?php echo esc_url($promotion['image']); ?>"
+					alt="<?php echo esc_attr($promotion['image_alt']); ?>"
 				/>
 			</div>
 			<div class="addons-wcs-banner-block-content">
-				<h1><?php echo esc_html( $promotion['title'] ); ?></h1>
-				<p><?php echo esc_html( $promotion['description'] ); ?></p>
+				<h1><?php echo esc_html($promotion['title']); ?></h1>
+				<p><?php echo esc_html($promotion['description']); ?></p>
 				<?php
-				if ( ! empty( $promotion['actions'] ) ) {
-					foreach ( $promotion['actions'] as $action ) {
-						self::output_promotion_action( $action );
+				if (!empty($promotion['actions'])) {
+					foreach ($promotion['actions'] as $action) {
+						self::output_promotion_action($action);
 					}
 				}
 				?>
@@ -697,25 +697,25 @@ 
 	 *
 	 * @param array $section Section data.
 	 */
-	public static function output_promotion_block( $section ) {
+	public static function output_promotion_block($section) {
 		if (
-			! current_user_can( 'install_plugins' ) ||
-			! current_user_can( 'activate_plugins' )
+			!current_user_can('install_plugins') ||
+			!current_user_can('activate_plugins')
 		) {
 			return;
 		}
 
 		$section_object = (object) $section;
 
-		if ( ! empty( $section_object->geowhitelist ) ) {
-			$section_object->geowhitelist = explode( ',', $section_object->geowhitelist );
+		if (!empty($section_object->geowhitelist)) {
+			$section_object->geowhitelist = explode(',', $section_object->geowhitelist);
 		}
 
-		if ( ! empty( $section_object->geoblacklist ) ) {
-			$section_object->geoblacklist = explode( ',', $section_object->geoblacklist );
+		if (!empty($section_object->geoblacklist)) {
+			$section_object->geoblacklist = explode(',', $section_object->geoblacklist);
 		}
 
-		if ( ! self::show_extension( $section_object ) ) {
+		if (!self::show_extension($section_object)) {
 			return;
 		}
 
@@ -723,17 +723,17 @@ 
 		<div class="addons-banner-block addons-promotion-block">
 			<img
 				class="addons-img"
-				src="<?php echo esc_url( $section['image'] ); ?>"
-				alt="<?php echo esc_attr( $section['image_alt'] ); ?>"
+				src="<?php echo esc_url($section['image']); ?>"
+				alt="<?php echo esc_attr($section['image_alt']); ?>"
 			/>
 			<div class="addons-promotion-block-content">
-				<h1 class="addons-promotion-block-title"><?php echo esc_html( $section['title'] ); ?></h1>
+				<h1 class="addons-promotion-block-title"><?php echo esc_html($section['title']); ?></h1>
 				<div class="addons-promotion-block-description">
-					<?php echo wp_kses_post( $section['description'] ); ?>
+					<?php echo wp_kses_post($section['description']); ?>
 				</div>
 				<div class="addons-promotion-block-buttons">
 					<?php
-					if ( $section['button_1'] ) {
+					if ($section['button_1']) {
 						self::output_button(
 							$section['button_1_href'],
 							$section['button_1'],
@@ -742,7 +742,7 @@ 
 						);
 					}
 
-					if ( $section['button_2'] ) {
+					if ($section['button_2']) {
 						self::output_button(
 							$section['button_2_href'],
 							$section['button_2'],
@@ -762,35 +762,35 @@ 
 	 *
 	 * @param array $sections Section data.
 	 */
-	public static function output_featured_sections( $sections ) {
-		foreach ( $sections as $section ) {
-			switch ( $section->module ) {
+	public static function output_featured_sections($sections) {
+		foreach ($sections as $section) {
+			switch ($section->module) {
 				case 'banner_block':
-					self::output_banner_block( $section );
+					self::output_banner_block($section);
 					break;
 				case 'column_start':
-					self::output_column( $section );
+					self::output_column($section);
 					break;
 				case 'column_end':
-					self::output_column( $section );
+					self::output_column($section);
 					break;
 				case 'column_block':
-					self::output_column_block( $section );
+					self::output_column_block($section);
 					break;
 				case 'small_light_block':
-					self::output_small_light_block( $section );
+					self::output_small_light_block($section);
 					break;
 				case 'small_dark_block':
-					self::output_small_dark_block( $section );
+					self::output_small_dark_block($section);
 					break;
 				case 'wcs_banner_block':
-					self::output_wcs_banner_block( (array) $section );
+					self::output_wcs_banner_block((array) $section);
 					break;
 				case 'wcpay_banner_block':
-					self::output_wcpay_banner_block( (array) $section );
+					self::output_wcpay_banner_block((array) $section);
 					break;
 				case 'promotion_block':
-					self::output_promotion_block( (array) $section );
+					self::output_promotion_block((array) $section);
 					break;
 			}
 		}
@@ -801,15 +801,15 @@ 
 	 *
 	 * @param array $blocks Featured page's blocks.
 	 */
-	private static function output_featured( $blocks ) {
-		foreach ( $blocks as $block ) {
+	private static function output_featured($blocks) {
+		foreach ($blocks as $block) {
 			$block_type = $block->type ?? null;
-			switch ( $block_type ) {
+			switch ($block_type) {
 				case 'group':
-					self::output_group( $block );
+					self::output_group($block);
 					break;
 				case 'banner':
-					self::output_banner( $block );
+					self::output_banner($block);
 					break;
 			}
 		}
@@ -822,31 +822,31 @@ 
 	 *
 	 * @return void
 	 */
-	private static function output_group( $block ) {
+	private static function output_group($block) {
 		$capacity             = $block->capacity ?? 3;
 		$product_list_classes = 3 === $capacity ? 'three-column' : 'two-column';
 		$product_list_classes = 'products addons-products-' . $product_list_classes;
 		?>
 			<section class="addon-product-group">
-				<h2 class="addon-product-group-title"><?php echo esc_html( $block->title ); ?></h2>
+				<h2 class="addon-product-group-title"><?php echo esc_html($block->title); ?></h2>
 				<div class="addon-product-group-description-container">
-					<?php if ( ! empty( $block->description ) ) : ?>
+					<?php if (!empty($block->description)) : ?>
 					<div class="addon-product-group-description">
-						<?php echo esc_html( $block->description ); ?>
+						<?php echo esc_html($block->description); ?>
 					</div>
 					<?php endif; ?>
-					<?php if ( null !== $block->url ) : ?>
-					<a class="addon-product-group-see-more" href="<?php echo esc_url( $block->url ); ?>">
-						<?php esc_html_e( 'See more', 'woocommerce' ); ?>
+					<?php if (null !== $block->url) : ?>
+					<a class="addon-product-group-see-more" href="<?php echo esc_url($block->url); ?>">
+						<?php esc_html_e('See more', 'woocommerce'); ?>
 					</a>
 					<?php endif; ?>
 				</div>
 				<div class="addon-product-group__items">
-					<ul class="<?php echo esc_attr( $product_list_classes ); ?>">
+					<ul class="<?php echo esc_attr($product_list_classes); ?>">
 					<?php
-					$products = array_slice( $block->items, 0, $capacity );
-					foreach ( $products as $item ) {
-						self::render_product_card( $item );
+					$products = array_slice($block->items, 0, $capacity);
+					foreach ($products as $item) {
+						self::render_product_card($item);
 					}
 					?>
 					</ul>
@@ -862,12 +862,12 @@ 
 	 *
 	 * @return void
 	 */
-	private static function output_banner( $block ) {
-		if ( empty( $block->buttons ) ) {
+	private static function output_banner($block) {
+		if (empty($block->buttons)) {
 			// Render a product-like banner.
 			?>
 			<ul class="products">
-				<?php self::render_product_card( $block, $block->type ); ?>
+				<?php self::render_product_card($block, $block->type); ?>
 			</ul>
 			<?php
 		} else {
@@ -876,25 +876,25 @@ 
 			<ul class="products">
 				<li class="product addons-buttons-banner">
 					<div class="addons-buttons-banner-image"
-						style="background-image:url(<?php echo esc_url( $block->image ); ?>)"
-						title="<?php echo esc_attr( $block->image_alt ); ?>"></div>
+						style="background-image:url(<?php echo esc_url($block->image); ?>)"
+						title="<?php echo esc_attr($block->image_alt); ?>"></div>
 					<div class="product-details addons-buttons-banner-details-container">
 						<div class="addons-buttons-banner-details">
-							<h2><?php echo esc_html( $block->title ); ?></h2>
-							<p><?php echo wp_kses( $block->description, array() ); ?></p>
+							<h2><?php echo esc_html($block->title); ?></h2>
+							<p><?php echo wp_kses($block->description, array()); ?></p>
 						</div>
 						<div class="addons-buttons-banner-button-container">
 						<?php
-						foreach ( $block->buttons as $button ) {
-							$button_classes = array( 'button', 'addons-buttons-banner-button' );
+						foreach ($block->buttons as $button) {
+							$button_classes = array('button', 'addons-buttons-banner-button');
 							$type           = $button->type ?? null;
-							if ( 'primary' === $type ) {
+							if ('primary' === $type) {
 								$button_classes[] = 'addons-buttons-banner-button-primary';
 							}
 							?>
-							<a class="<?php echo esc_attr( implode( ' ', $button_classes ) ); ?>"
-								href="<?php echo esc_url( $button->href ); ?>">
-								<?php echo esc_html( $button->title ); ?>
+							<a class="<?php echo esc_attr(implode(' ', $button_classes)); ?>"
+								href="<?php echo esc_url($button->href); ?>">
+								<?php echo esc_html($button->title); ?>
 							</a>
 						<?php } ?>
 						</div>
@@ -911,12 +911,12 @@ 
 	public static function get_in_app_purchase_url_params() {
 		// Get url (from path onward) for the current page,
 		// so WCCOM "back" link returns user to where they were.
-		$back_admin_path = add_query_arg( array() );
+		$back_admin_path = add_query_arg(array());
 		return array(
 			'wccom-site'          => site_url(),
-			'wccom-back'          => rawurlencode( $back_admin_path ),
-			'wccom-woo-version'   => Constants::get_constant( 'WC_VERSION' ),
-			'wccom-connect-nonce' => wp_create_nonce( 'connect' ),
+			'wccom-back'          => rawurlencode($back_admin_path),
+			'wccom-woo-version'   => Constants::get_constant('WC_VERSION'),
+			'wccom-connect-nonce' => wp_create_nonce('connect'),
 		);
 	}
 
@@ -928,7 +928,7 @@ 
 	 *
 	 * @param string $url    Destination URL.
 	 */
-	public static function add_in_app_purchase_url_params( $url ) {
+	public static function add_in_app_purchase_url_params($url) {
 		return add_query_arg(
 			self::get_in_app_purchase_url_params(),
 			$url
@@ -943,16 +943,16 @@ 
 	 * @param string $style  Button style class.
 	 * @param string $plugin The plugin the button is promoting.
 	 */
-	public static function output_button( $url, $text, $style, $plugin = '' ) {
-		$style = __( 'Free', 'woocommerce' ) === $text ? 'addons-button-outline-purple' : $style;
-		$style = is_plugin_active( $plugin ) ? 'addons-button-installed' : $style;
-		$text  = is_plugin_active( $plugin ) ? __( 'Installed', 'woocommerce' ) : $text;
-		$url   = self::add_in_app_purchase_url_params( $url );
+	public static function output_button($url, $text, $style, $plugin = '') {
+		$style = __('Free', 'woocommerce') === $text ? 'addons-button-outline-purple' : $style;
+		$style = is_plugin_active($plugin) ? 'addons-button-installed' : $style;
+		$text  = is_plugin_active($plugin) ? __('Installed', 'woocommerce') : $text;
+		$url   = self::add_in_app_purchase_url_params($url);
 		?>
 		<a
-			class="addons-button <?php echo esc_attr( $style ); ?>"
-			href="<?php echo esc_url( $url ); ?>">
-			<?php echo esc_html( $text ); ?>
+			class="addons-button <?php echo esc_attr($style); ?>"
+			href="<?php echo esc_url($url); ?>">
+			<?php echo esc_html($text); ?>
 		</a>
 		<?php
 	}
@@ -964,16 +964,16 @@ 
 	 *
 	 * @return void
 	 */
-	public static function output_promotion_action( array $action ) {
-		if ( empty( $action ) ) {
+	public static function output_promotion_action(array $action) {
+		if (empty($action)) {
 			return;
 		}
-		$style = ( ! empty( $action['primary'] ) && $action['primary'] ) ? 'addons-button-solid' : 'addons-button-outline-purple';
+		$style = (!empty($action['primary']) && $action['primary']) ? 'addons-button-solid' : 'addons-button-outline-purple';
 		?>
 		<a
-			class="addons-button <?php echo esc_attr( $style ); ?>"
-			href="<?php echo esc_url( $action['url'] ); ?>">
-			<?php echo esc_html( $action['label'] ); ?>
+			class="addons-button <?php echo esc_attr($style); ?>"
+			href="<?php echo esc_url($action['url']); ?>">
+			<?php echo esc_html($action['label']); ?>
 		</a>
 		<?php
 	}
@@ -985,12 +985,12 @@ 
 	 *
 	 * @return void
 	 */
-	public static function output_empty( $message = '' ) {
+	public static function output_empty($message = '') {
 		?>
 		<div class="wc-addons__empty">
-			<h2><?php echo wp_kses_post( __( 'Oh no! We\'re having trouble connecting to the extensions catalog right now.', 'woocommerce' ) ); ?></h2>
-			<?php if ( ! empty( $message ) ) : ?>
-				<p><?php echo esc_html( $message ); ?></p>
+			<h2><?php echo wp_kses_post(__('Oh no! We\'re having trouble connecting to the extensions catalog right now.', 'woocommerce')); ?></h2>
+			<?php if (!empty($message)) : ?>
+				<p><?php echo esc_html($message); ?></p>
 			<?php endif; ?>
 			<p>
 				<?php
@@ -1015,21 +1015,21 @@ 
 	 * Handles output of the addons page in admin.
 	 */
 	public static function output() {
-		$section = isset( $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '_featured';
-		$search  = isset( $_GET['search'] ) ? sanitize_text_field( wp_unslash( $_GET['search'] ) ) : '';
+		$section = isset($_GET['section']) ? sanitize_text_field(wp_unslash($_GET['section'])) : '_featured';
+		$search  = isset($_GET['search']) ? sanitize_text_field(wp_unslash($_GET['search'])) : '';
 
-		if ( isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
-			do_action( 'woocommerce_helper_output' );
+		if (isset($_GET['section']) && 'helper' === $_GET['section']) {
+			do_action('woocommerce_helper_output');
 			return;
 		}
 
-		if ( isset( $_GET['install-addon'] ) ) {
-			switch ( $_GET['install-addon'] ) {
+		if (isset($_GET['install-addon'])) {
+			switch ($_GET['install-addon']) {
 				case 'woocommerce-services':
 					self::install_woocommerce_services_addon();
 					break;
 				case 'woocommerce-payments':
-					self::install_woocommerce_payments_addon( $section );
+					self::install_woocommerce_payments_addon($section);
 					break;
 				default:
 					// Do nothing.
@@ -1039,34 +1039,34 @@ 
 
 		$sections        = self::get_sections();
 		$theme           = wp_get_theme();
-		$current_section = isset( $_GET['section'] ) ? $section : '_featured';
+		$current_section = isset($_GET['section']) ? $section : '_featured';
 		$promotions      = array();
 		$addons          = array();
 
-		if ( '_featured' !== $current_section ) {
+		if ('_featured' !== $current_section) {
 			$category       = $section ? $section : null;
 			$term           = $search ? $search : null;
 			$country        = WC()->countries->get_base_country();
-			$extension_data = self::get_extension_data( $category, $term, $country );
-			$addons         = is_wp_error( $extension_data ) ? $extension_data : $extension_data->products;
-			$promotions     = ! empty( $extension_data->promotions ) ? $extension_data->promotions : array();
+			$extension_data = self::get_extension_data($category, $term, $country);
+			$addons         = is_wp_error($extension_data) ? $extension_data : $extension_data->products;
+			$promotions     = !empty($extension_data->promotions) ? $extension_data->promotions : array();
 		}
 
 		// We need Automattic\WooCommerce\Admin\RemoteInboxNotifications for the next part, if not remove all promotions.
-		if ( ! WC()->is_wc_admin_active() ) {
+		if (!WC()->is_wc_admin_active()) {
 			$promotions = array();
 		}
 		// Check for existence of promotions and evaluate out if we should show them.
-		if ( ! empty( $promotions ) ) {
-			foreach ( $promotions as $promo_id => $promotion ) {
+		if (!empty($promotions)) {
+			foreach ($promotions as $promo_id => $promotion) {
 				$evaluator = new PromotionRuleEngine\RuleEvaluator();
-				$passed    = $evaluator->evaluate( $promotion->rules );
-				if ( ! $passed ) {
-					unset( $promotions[ $promo_id ] );
+				$passed    = $evaluator->evaluate($promotion->rules);
+				if (!$passed) {
+					unset($promotions[$promo_id]);
 				}
 			}
 			// Transform promotions to the correct format ready for output.
-			$promotions = self::format_promotions( $promotions );
+			$promotions = self::format_promotions($promotions);
 		}
 
 		/**
@@ -1078,24 +1078,24 @@ 
 		 * @uses $theme
 		 * @uses $current_section
 		 */
-		include_once dirname( __FILE__ ) . '/views/html-admin-page-addons.php';
+		include_once dirname(__FILE__) . '/views/html-admin-page-addons.php';
 	}
 
 	/**
 	 * Install WooCommerce Services from Extensions screens.
 	 */
 	public static function install_woocommerce_services_addon() {
-		check_admin_referer( 'install-addon_woocommerce-services' );
+		check_admin_referer('install-addon_woocommerce-services');
 
 		$services_plugin_id = 'woocommerce-services';
 		$services_plugin    = array(
-			'name'      => __( 'WooCommerce Services', 'woocommerce' ),
+			'name'      => __('WooCommerce Services', 'woocommerce'),
 			'repo-slug' => 'woocommerce-services',
 		);
 
-		WC_Install::background_installer( $services_plugin_id, $services_plugin );
+		WC_Install::background_installer($services_plugin_id, $services_plugin);
 
-		wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('install-addon', '_wpnonce')));
 		exit;
 	}
 
@@ -1106,20 +1106,20 @@ 
 	 *
 	 * @return void
 	 */
-	public static function install_woocommerce_payments_addon( $section = '_featured' ) {
-		check_admin_referer( 'install-addon_woocommerce-payments' );
+	public static function install_woocommerce_payments_addon($section = '_featured') {
+		check_admin_referer('install-addon_woocommerce-payments');
 
 		$wcpay_plugin_id = 'woocommerce-payments';
 		$wcpay_plugin    = array(
-			'name'      => __( 'WooCommerce Payments', 'woocommerce' ),
+			'name'      => __('WooCommerce Payments', 'woocommerce'),
 			'repo-slug' => 'woocommerce-payments',
 		);
 
-		WC_Install::background_installer( $wcpay_plugin_id, $wcpay_plugin );
+		WC_Install::background_installer($wcpay_plugin_id, $wcpay_plugin);
 
-		do_action( 'woocommerce_addon_installed', $wcpay_plugin_id, $section );
+		do_action('woocommerce_addon_installed', $wcpay_plugin_id, $section);
 
-		wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('install-addon', '_wpnonce')));
 		exit;
 	}
 
@@ -1131,8 +1131,8 @@ 
 	 *
 	 * @return string Body class with added class for Marketplace or My Subscriptions page.
 	 */
-	public static function filter_admin_body_classes( string $admin_body_class = '' ): string {
-		if ( isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
+	public static function filter_admin_body_classes(string $admin_body_class = ''): string {
+		if (isset($_GET['section']) && 'helper' === $_GET['section']) {
 			return " $admin_body_class woocommerce-page-wc-subscriptions ";
 		}
 
@@ -1155,16 +1155,16 @@ 
 	 *
 	 * @return string CSS class to use.
 	 */
-	public static function get_star_class( $rating, $index ) {
-		if ( $rating >= $index ) {
+	public static function get_star_class($rating, $index) {
+		if ($rating >= $index) {
 			// Rating more that current star to show.
 			return 'fill';
 		} elseif (
-			abs( $index - 1 - floor( $rating ) ) < 0.0000001 &&
-			0 < ( $rating - floor( $rating ) )
+			abs($index - 1 - floor($rating)) < 0.0000001 &&
+			0 < ($rating - floor($rating))
 		) {
 			// For rating more than x.0 and less than x.5 or equal it will show a half star.
-			return 50 >= floor( ( $rating - floor( $rating ) ) * 100 )
+			return 50 >= floor(($rating - floor($rating)) * 100)
 				? 'half-fill'
 				: 'fill';
 		}
@@ -1179,21 +1179,21 @@ 
 	 * @param object $action Action object.
 	 * @return string URL.
 	 */
-	public static function get_action_url( $action ): string {
-		if ( ! isset( $action->url ) ) {
+	public static function get_action_url($action): string {
+		if (!isset($action->url)) {
 			return '';
 		}
 
-		if ( isset( $action->url_is_admin_query ) && $action->url_is_admin_query ) {
-			return wc_admin_url( $action->url );
+		if (isset($action->url_is_admin_query) && $action->url_is_admin_query) {
+			return wc_admin_url($action->url);
 		}
 
-		if ( isset( $action->url_is_admin_nonce_query ) && $action->url_is_admin_nonce_query ) {
-			if ( empty( $action->nonce ) ) {
+		if (isset($action->url_is_admin_nonce_query) && $action->url_is_admin_nonce_query) {
+			if (empty($action->nonce)) {
 				return '';
 			}
 			return wp_nonce_url(
-				admin_url( $action->url ),
+				admin_url($action->url),
 				$action->nonce
 			);
 		}
@@ -1207,26 +1207,26 @@ 
 	 * @param array $promotions Array of promotoin objects.
 	 * @return array Array of formatted promotions ready for output.
 	 */
-	public static function format_promotions( array $promotions ): array {
+	public static function format_promotions(array $promotions): array {
 		$formatted_promotions = array();
-		foreach ( $promotions as $promotion ) {
+		foreach ($promotions as $promotion) {
 			// Get the matching locale or fall back to en-US.
-			$locale = PromotionRuleEngine\SpecRunner::get_locale( $promotion->locales );
-			if ( null === $locale ) {
+			$locale = PromotionRuleEngine\SpecRunner::get_locale($promotion->locales);
+			if (null === $locale) {
 				continue;
 			}
 
 			$promotion_actions = array();
-			if ( ! empty( $promotion->actions ) ) {
-				foreach ( $promotion->actions as $action ) {
-					$action_locale = PromotionRuleEngine\SpecRunner::get_action_locale( $action->locales );
-					$url           = self::get_action_url( $action );
+			if (!empty($promotion->actions)) {
+				foreach ($promotion->actions as $action) {
+					$action_locale = PromotionRuleEngine\SpecRunner::get_action_locale($action->locales);
+					$url           = self::get_action_url($action);
 
 					$promotion_actions[] = array(
 						'name'    => $action->name,
 						'label'   => $action_locale->label,
 						'url'     => $url,
-						'primary' => isset( $action->is_primary ) ? $action->is_primary : false,
+						'primary' => isset($action->is_primary) ? $action->is_primary : false,
 					);
 				}
 			}
@@ -1234,7 +1234,7 @@ 
 			$formatted_promotions[] = array(
 				'title'       => $locale->title,
 				'description' => $locale->description,
-				'image'       => ( 'http' === substr( $locale->image, 0, 4 ) ) ? $locale->image : WC()->plugin_url() . $locale->image,
+				'image'       => ('http' === substr($locale->image, 0, 4)) ? $locale->image : WC()->plugin_url() . $locale->image,
 				'image_alt'   => $locale->image_alt,
 				'actions'     => $promotion_actions,
 			);
@@ -1252,21 +1252,21 @@ 
 	 *
 	 * @return object Converted data.
 	 */
-	public static function map_product_card_data( $data ) {
+	public static function map_product_card_data($data) {
 		$mapped = (object) null;
 
 		$type = $data->type ?? null;
 
 		// Icon.
 		$mapped->icon = $data->icon ?? null;
-		if ( null === $mapped->icon && 'banner' === $type ) {
+		if (null === $mapped->icon && 'banner' === $type) {
 			// For product-related banners icon is a product's image.
 			$mapped->icon = $data->image ?? null;
 		}
 
 		// URL.
 		$mapped->url = $data->link ?? null;
-		if ( empty( $mapped->url ) ) {
+		if (empty($mapped->url)) {
 			$mapped->url = $data->url ?? null;
 		}
 
@@ -1275,34 +1275,34 @@ 
 
 		// Vendor Name.
 		$mapped->vendor_name = $data->vendor_name ?? null;
-		if ( empty( $mapped->vendor_name ) ) {
+		if (empty($mapped->vendor_name)) {
 			$mapped->vendor_name = $data->vendorName ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		}
 
 		// Vendor URL.
 		$mapped->vendor_url = $data->vendor_url ?? null;
-		if ( empty( $mapped->vendor_url ) ) {
+		if (empty($mapped->vendor_url)) {
 			$mapped->vendor_url = $data->vendorUrl ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		}
 
 		// Description.
 		$mapped->description = $data->excerpt ?? null;
-		if ( empty( $mapped->description ) ) {
+		if (empty($mapped->description)) {
 			$mapped->description = $data->description ?? null;
 		}
 
-		$has_currency = ! empty( $data->currency ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		$has_currency = !empty($data->currency); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 
 		// Is Free.
-		if ( $has_currency ) {
+		if ($has_currency) {
 			$mapped->is_free = 0 === (int) $data->price;
 		} else {
 			$mapped->is_free = '&#36;0.00' === $data->price;
 		}
 
 		// Price.
-		if ( $has_currency ) {
-			$mapped->price = wc_price( $data->price, array( 'currency' => $data->currency ) );
+		if ($has_currency) {
+			$mapped->price = wc_price($data->price, array('currency' => $data->currency));
 		} else {
 			$mapped->price = $data->price;
 		}
@@ -1312,13 +1312,13 @@ 
 
 		// Rating.
 		$mapped->rating = $data->rating ?? null;
-		if ( null === $mapped->rating ) {
+		if (null === $mapped->rating) {
 			$mapped->rating = $data->averageRating ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		}
 
 		// Reviews Count.
 		$mapped->reviews_count = $data->reviews_count ?? null;
-		if ( null === $mapped->reviews_count ) {
+		if (null === $mapped->reviews_count) {
 			$mapped->reviews_count = $data->reviewsCount ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		}
 		// Featured & Promoted product card.
@@ -1345,44 +1345,44 @@ 
 	 *
 	 * @return void
 	 */
-	public static function render_product_card( $data, $block_type = null ) {
-		$mapped      = self::map_product_card_data( $data );
-		$product_url = self::add_in_app_purchase_url_params( $mapped->url );
-		$class_names = array( 'product' );
+	public static function render_product_card($data, $block_type = null) {
+		$mapped      = self::map_product_card_data($data);
+		$product_url = self::add_in_app_purchase_url_params($mapped->url);
+		$class_names = array('product');
 		// Specify a class name according to $block_type (if it's specified).
-		if ( null !== $block_type ) {
+		if (null !== $block_type) {
 			$class_names[] = 'addons-product-' . $block_type;
 		}
 
 		$product_details_classes = 'product-details';
-		if ( 'banner' === $block_type ) {
+		if ('banner' === $block_type) {
 			$product_details_classes .= ' addon-product-banner-details';
 		}
 
-		if ( isset( $mapped->label ) && 'promoted' === $mapped->label ) {
+		if (isset($mapped->label) && 'promoted' === $mapped->label) {
 			$product_details_classes .= ' promoted';
-		} elseif ( isset( $mapped->label ) && 'featured' === $mapped->label ) {
+		} elseif (isset($mapped->label) && 'featured' === $mapped->label) {
 			$product_details_classes .= ' featured';
 		}
 
-		if ( 'promoted' === $mapped->label
-			&& ! empty( $mapped->primary_color )
-			&& ! empty( $mapped->text_color )
-			&& ! empty( $mapped->button ) ) {
+		if ('promoted' === $mapped->label
+			&& !empty($mapped->primary_color)
+			&& !empty($mapped->text_color)
+			&& !empty($mapped->button)) {
 			// Promoted product card.
 			?>
 			<li class="product">
-				<div class="<?php echo esc_attr( $product_details_classes ); ?>" style="border-top: 5px  solid <?php echo esc_html( $mapped->primary_color ); ?>;">
-					<span class="label promoted"><?php esc_attr_e( 'Promoted', 'woocommerce' ); ?></span>
-					<a href="<?php echo esc_url( $product_url ); ?>">
-						<h2><?php echo esc_html( $mapped->title ); ?></h2>
+				<div class="<?php echo esc_attr($product_details_classes); ?>" style="border-top: 5px  solid <?php echo esc_html($mapped->primary_color); ?>;">
+					<span class="label promoted"><?php esc_attr_e('Promoted', 'woocommerce'); ?></span>
+					<a href="<?php echo esc_url($product_url); ?>">
+						<h2><?php echo esc_html($mapped->title); ?></h2>
 					</a>
-					<p><?php echo wp_kses_post( $mapped->description ); ?></p>
+					<p><?php echo wp_kses_post($mapped->description); ?></p>
 				</div>
 				<div class="product-footer-promoted">
-					<span class="icon"><img src="<?php echo esc_url( $mapped->icon ); ?>" /></span>
-					<a class="addons-button addons-button-promoted" style="background: <?php echo esc_html( $mapped->primary_color ); ?>; color: <?php echo esc_html( $mapped->text_color ); ?>;" href="<?php echo esc_url( $product_url ); ?>">
-						<?php echo esc_html( $mapped->button ); ?>
+					<span class="icon"><img src="<?php echo esc_url($mapped->icon); ?>" /></span>
+					<a class="addons-button addons-button-promoted" style="background: <?php echo esc_html($mapped->primary_color); ?>; color: <?php echo esc_html($mapped->text_color); ?>;" href="<?php echo esc_url($product_url); ?>">
+						<?php echo esc_html($mapped->button); ?>
 					</a>
 				</div>
 			</li>
@@ -1390,16 +1390,16 @@ 
 		} else {
 			// Normal or "featured" product card.
 			?>
-			<li class="<?php echo esc_attr( implode( ' ', $class_names ) ); ?>">
-				<div class="<?php echo esc_attr( $product_details_classes ); ?>">
+			<li class="<?php echo esc_attr(implode(' ', $class_names)); ?>">
+				<div class="<?php echo esc_attr($product_details_classes); ?>">
 					<div class="product-text-container">
-						<?php if ( isset( $mapped->label ) && 'featured' === $mapped->label ) { ?>
-							<span class="label featured"><?php esc_attr_e( 'Featured', 'woocommerce' ); ?></span>
+						<?php if (isset($mapped->label) && 'featured' === $mapped->label) { ?>
+							<span class="label featured"><?php esc_attr_e('Featured', 'woocommerce'); ?></span>
 						<?php } ?>
-						<a href="<?php echo esc_url( $product_url ); ?>">
-							<h2><?php echo esc_html( $mapped->title ); ?></h2>
+						<a href="<?php echo esc_url($product_url); ?>">
+							<h2><?php echo esc_html($mapped->title); ?></h2>
 						</a>
-						<?php if ( ! empty( $mapped->vendor_name ) && ! empty( $mapped->vendor_url ) ) : ?>
+						<?php if (!empty($mapped->vendor_name) && !empty($mapped->vendor_url)) : ?>
 							<div class="product-developed-by">
 								<?php
 								$vendor_url = add_query_arg(
@@ -1414,30 +1414,30 @@ 
 
 								printf(
 								/* translators: %s vendor link */
-									esc_html__( 'Developed by %s', 'woocommerce' ),
+									esc_html__('Developed by %s', 'woocommerce'),
 									sprintf(
 										'<a class="product-vendor-link" href="%1$s" target="_blank">%2$s</a>',
-										esc_url_raw( $vendor_url ),
-										esc_html( $mapped->vendor_name )
+										esc_url_raw($vendor_url),
+										esc_html($mapped->vendor_name)
 									)
 								);
 								?>
 							</div>
 						<?php endif; ?>
-						<p><?php echo wp_kses_post( $mapped->description ); ?></p>
+						<p><?php echo wp_kses_post($mapped->description); ?></p>
 					</div>
-					<?php if ( ! empty( $mapped->icon ) ) : ?>
+					<?php if (!empty($mapped->icon)) : ?>
 						<span class="product-img-wrap">
 							<?php /* Show an icon if it exists */ ?>
-							<img src="<?php echo esc_url( $mapped->icon ); ?>" />
+							<img src="<?php echo esc_url($mapped->icon); ?>" />
 						</span>
 					<?php endif; ?>
 				</div>
 				<div class="product-footer">
 					<div class="product-price-and-reviews-container">
 						<div class="product-price-block">
-							<?php if ( $mapped->is_free ) : ?>
-								<span class="price"><?php esc_html_e( 'Free', 'woocommerce' ); ?></span>
+							<?php if ($mapped->is_free) : ?>
+								<span class="price"><?php esc_html_e('Free', 'woocommerce'); ?></span>
 							<?php else : ?>
 								<span class="price">
 									<?php
@@ -1454,28 +1454,28 @@ 
 								</span>
 								<span class="price-suffix">
 									<?php
-									$price_suffix = __( 'per year', 'woocommerce' );
-									if ( ! empty( $mapped->price_suffix ) ) {
+									$price_suffix = __('per year', 'woocommerce');
+									if (!empty($mapped->price_suffix)) {
 										$price_suffix = $mapped->price_suffix;
 									}
-									echo esc_html( $price_suffix );
+									echo esc_html($price_suffix);
 									?>
 								</span>
 							<?php endif; ?>
 						</div>
-						<?php if ( ! empty( $mapped->reviews_count ) && ! empty( $mapped->rating ) ) : ?>
+						<?php if (!empty($mapped->reviews_count) && !empty($mapped->rating)) : ?>
 							<?php /* Show rating and the number of reviews */ ?>
 							<div class="product-reviews-block">
-								<?php for ( $index = 1; $index <= 5; ++$index ) : ?>
-									<?php $rating_star_class = 'product-rating-star product-rating-star__' . self::get_star_class( $mapped->rating, $index ); ?>
-									<div class="<?php echo esc_attr( $rating_star_class ); ?>"></div>
+								<?php for ($index = 1; $index <= 5; ++$index) : ?>
+									<?php $rating_star_class = 'product-rating-star product-rating-star__' . self::get_star_class($mapped->rating, $index); ?>
+									<div class="<?php echo esc_attr($rating_star_class); ?>"></div>
 								<?php endfor; ?>
 								<span class="product-reviews-count">(<?php echo (int) $mapped->reviews_count; ?>)</span>
 							</div>
 						<?php endif; ?>
 					</div>
-					<a class="button" href="<?php echo esc_url( $product_url ); ?>">
-						<?php esc_html_e( 'View details', 'woocommerce' ); ?>
+					<a class="button" href="<?php echo esc_url($product_url); ?>">
+						<?php esc_html_e('View details', 'woocommerce'); ?>
 					</a>
 				</div>
 			</li>

Braces +3 added lines, -1 removed lines

@@ -1438,7 +1438,8 @@ 
 						<div class="product-price-block">
 							<?php if ( $mapped->is_free ) : ?>
 								<span class="price"><?php esc_html_e( 'Free', 'woocommerce' ); ?></span>
-							<?php else : ?>
+							<?php else {
+    : ?>
 								<span class="price">
 									<?php
 									echo wp_kses(
@@ -1450,6 +1451,7 @@ 
 											'bdi'  => array(),
 										)
 									);
+}
 									?>
 								</span>
 								<span class="price-suffix">

plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php

Indentation +17 added lines, -17 removed lines

@@ -15,23 +15,23 @@
  */
 class WC_Meta_Box_Product_Short_Description {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public static function output( $post ) {
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post Post object.
+     */
+    public static function output( $post ) {
 
-		$settings = array(
-			'textarea_name' => 'excerpt',
-			'quicktags'     => array( 'buttons' => 'em,strong,link' ),
-			'tinymce'       => array(
-				'theme_advanced_buttons1' => 'bold,italic,strikethrough,separator,bullist,numlist,separator,blockquote,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,separator,undo,redo,separator',
-				'theme_advanced_buttons2' => '',
-			),
-			'editor_css'    => '<style>#wp-excerpt-editor-container .wp-editor-area{height:175px; width:100%;}</style>',
-		);
+        $settings = array(
+            'textarea_name' => 'excerpt',
+            'quicktags'     => array( 'buttons' => 'em,strong,link' ),
+            'tinymce'       => array(
+                'theme_advanced_buttons1' => 'bold,italic,strikethrough,separator,bullist,numlist,separator,blockquote,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,separator,undo,redo,separator',
+                'theme_advanced_buttons2' => '',
+            ),
+            'editor_css'    => '<style>#wp-excerpt-editor-container .wp-editor-area{height:175px; width:100%;}</style>',
+        );
 
-		wp_editor( htmlspecialchars_decode( $post->post_excerpt, ENT_QUOTES ), 'excerpt', apply_filters( 'woocommerce_product_short_description_editor_settings', $settings ) );
-	}
+        wp_editor( htmlspecialchars_decode( $post->post_excerpt, ENT_QUOTES ), 'excerpt', apply_filters( 'woocommerce_product_short_description_editor_settings', $settings ) );
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
  * @version     2.1.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Meta_Box_Product_Short_Description Class.
@@ -20,11 +20,11 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		$settings = array(
 			'textarea_name' => 'excerpt',
-			'quicktags'     => array( 'buttons' => 'em,strong,link' ),
+			'quicktags'     => array('buttons' => 'em,strong,link'),
 			'tinymce'       => array(
 				'theme_advanced_buttons1' => 'bold,italic,strikethrough,separator,bullist,numlist,separator,blockquote,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,separator,undo,redo,separator',
 				'theme_advanced_buttons2' => '',
@@ -32,6 +32,6 @@ 
 			'editor_css'    => '<style>#wp-excerpt-editor-container .wp-editor-area{height:175px; width:100%;}</style>',
 		);
 
-		wp_editor( htmlspecialchars_decode( $post->post_excerpt, ENT_QUOTES ), 'excerpt', apply_filters( 'woocommerce_product_short_description_editor_settings', $settings ) );
+		wp_editor(htmlspecialchars_decode($post->post_excerpt, ENT_QUOTES), 'excerpt', apply_filters('woocommerce_product_short_description_editor_settings', $settings));
 	}
 }

plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php

Indentation +131 added lines, -131 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly.
+    exit; // Exit if accessed directly.
 }
 
 /**
@@ -17,23 +17,23 @@ 
  */
 class WC_Meta_Box_Order_Actions {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public static function output( $post ) {
-		global $theorder;
-
-		// This is used by some callbacks attached to hooks such as woocommerce_order_actions which rely on the global to determine if actions should be displayed for certain orders.
-		// Avoid using this global with the `woocommerce_order_actions` filter, instead use the $order filter arg.
-		if ( ! is_object( $theorder ) ) {
-			$theorder = wc_get_order( $post->ID );
-		}
-
-		$theorder = $theorder instanceof WC_Order ? $theorder : null;
-		$order_actions = self::get_available_order_actions_for_order( $theorder );
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post Post object.
+     */
+    public static function output( $post ) {
+        global $theorder;
+
+        // This is used by some callbacks attached to hooks such as woocommerce_order_actions which rely on the global to determine if actions should be displayed for certain orders.
+        // Avoid using this global with the `woocommerce_order_actions` filter, instead use the $order filter arg.
+        if ( ! is_object( $theorder ) ) {
+            $theorder = wc_get_order( $post->ID );
+        }
+
+        $theorder = $theorder instanceof WC_Order ? $theorder : null;
+        $order_actions = self::get_available_order_actions_for_order( $theorder );
+        ?>
 		<ul class="order_actions submitbox">
 
 			<?php do_action( 'woocommerce_order_actions_start', $post->ID ); ?>
@@ -51,18 +51,18 @@ 
 			<li class="wide">
 				<div id="delete-action">
 					<?php
-					if ( current_user_can( 'delete_post', $post->ID ) ) {
-
-						if ( ! EMPTY_TRASH_DAYS ) {
-							$delete_text = __( 'Delete permanently', 'woocommerce' );
-						} else {
-							$delete_text = __( 'Move to Trash', 'woocommerce' );
-						}
-						?>
+                    if ( current_user_can( 'delete_post', $post->ID ) ) {
+
+                        if ( ! EMPTY_TRASH_DAYS ) {
+                            $delete_text = __( 'Delete permanently', 'woocommerce' );
+                        } else {
+                            $delete_text = __( 'Move to Trash', 'woocommerce' );
+                        }
+                        ?>
 						<a class="submitdelete deletion" href="<?php echo esc_url( get_delete_post_link( $post->ID ) ); ?>"><?php echo esc_html( $delete_text ); ?></a>
 						<?php
-					}
-					?>
+                    }
+                    ?>
 				</div>
 
 				<button type="submit" class="button save_order button-primary" name="save" value="<?php echo 'auto-draft' === $post->post_status ? esc_attr__( 'Create', 'woocommerce' ) : esc_attr__( 'Update', 'woocommerce' ); ?>"><?php echo 'auto-draft' === $post->post_status ? esc_html__( 'Create', 'woocommerce' ) : esc_html__( 'Update', 'woocommerce' ); ?></button>
@@ -72,107 +72,107 @@ 
 
 		</ul>
 		<?php
-	}
-
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int     $post_id Post ID.
-	 * @param WP_Post $post Post Object.
-	 */
-	public static function save( $post_id, $post ) {
-		// Order data saved, now get it so we can manipulate status.
-		$order = wc_get_order( $post_id );
-
-		// Handle button actions.
-		if ( ! empty( $_POST['wc_order_action'] ) ) { // @codingStandardsIgnoreLine
-
-			$action = wc_clean( wp_unslash( $_POST['wc_order_action'] ) ); // @codingStandardsIgnoreLine
-
-			if ( 'send_order_details' === $action ) {
-				do_action( 'woocommerce_before_resend_order_emails', $order, 'customer_invoice' );
-
-				// Send the customer invoice email.
-				WC()->payment_gateways();
-				WC()->shipping();
-				WC()->mailer()->customer_invoice( $order );
-
-				// Note the event.
-				$order->add_order_note( __( 'Order details manually sent to customer.', 'woocommerce' ), false, true );
-
-				do_action( 'woocommerce_after_resend_order_email', $order, 'customer_invoice' );
-
-				// Change the post saved message.
-				add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
-
-			} elseif ( 'send_order_details_admin' === $action ) {
-
-				do_action( 'woocommerce_before_resend_order_emails', $order, 'new_order' );
-
-				WC()->payment_gateways();
-				WC()->shipping();
-				add_filter( 'woocommerce_new_order_email_allows_resend', '__return_true' );
-				WC()->mailer()->emails['WC_Email_New_Order']->trigger( $order->get_id(), $order, true );
-				remove_filter( 'woocommerce_new_order_email_allows_resend', '__return_true' );
-
-				do_action( 'woocommerce_after_resend_order_email', $order, 'new_order' );
-
-				// Change the post saved message.
-				add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
-
-			} elseif ( 'regenerate_download_permissions' === $action ) {
-
-				$data_store = WC_Data_Store::load( 'customer-download' );
-				$data_store->delete_by_order_id( $post_id );
-				wc_downloadable_product_permissions( $post_id, true );
-
-			} else {
-
-				if ( ! did_action( 'woocommerce_order_action_' . sanitize_title( $action ) ) ) {
-					do_action( 'woocommerce_order_action_' . sanitize_title( $action ), $order );
-				}
-			}
-		}
-	}
-
-	/**
-	 * Set the correct message ID.
-	 *
-	 * @param string $location Location.
-	 * @since  2.3.0
-	 * @static
-	 * @return string
-	 */
-	public static function set_email_sent_message( $location ) {
-		return add_query_arg( 'message', 11, $location );
-	}
-
-	/**
-	 * Get the available order actions for a given order.
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param WC_Order|null $order The order object or null if no order is available.
-	 *
-	 * @return array
-	 */
-	private static function get_available_order_actions_for_order( $order ) {
-		$actions = array(
-			'send_order_details'              => __( 'Email invoice / order details to customer', 'woocommerce' ),
-			'send_order_details_admin'        => __( 'Resend new order notification', 'woocommerce' ),
-			'regenerate_download_permissions' => __( 'Regenerate download permissions', 'woocommerce' ),
-		);
-
-		/**
-		 * Filter: woocommerce_order_actions
-		 * Allows filtering of the available order actions for an order.
-		 *
-		 * @since 2.1.0 Filter was added.
-		 * @since 5.8.0 The $order param was added.
-		 *
-		 * @param array         $actions The available order actions for the order.
-		 * @param WC_Order|null $order   The order object or null if no order is available.
-		 */
-		return apply_filters( 'woocommerce_order_actions', $actions, $order );
-	}
+    }
+
+    /**
+     * Save meta box data.
+     *
+     * @param int     $post_id Post ID.
+     * @param WP_Post $post Post Object.
+     */
+    public static function save( $post_id, $post ) {
+        // Order data saved, now get it so we can manipulate status.
+        $order = wc_get_order( $post_id );
+
+        // Handle button actions.
+        if ( ! empty( $_POST['wc_order_action'] ) ) { // @codingStandardsIgnoreLine
+
+            $action = wc_clean( wp_unslash( $_POST['wc_order_action'] ) ); // @codingStandardsIgnoreLine
+
+            if ( 'send_order_details' === $action ) {
+                do_action( 'woocommerce_before_resend_order_emails', $order, 'customer_invoice' );
+
+                // Send the customer invoice email.
+                WC()->payment_gateways();
+                WC()->shipping();
+                WC()->mailer()->customer_invoice( $order );
+
+                // Note the event.
+                $order->add_order_note( __( 'Order details manually sent to customer.', 'woocommerce' ), false, true );
+
+                do_action( 'woocommerce_after_resend_order_email', $order, 'customer_invoice' );
+
+                // Change the post saved message.
+                add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
+
+            } elseif ( 'send_order_details_admin' === $action ) {
+
+                do_action( 'woocommerce_before_resend_order_emails', $order, 'new_order' );
+
+                WC()->payment_gateways();
+                WC()->shipping();
+                add_filter( 'woocommerce_new_order_email_allows_resend', '__return_true' );
+                WC()->mailer()->emails['WC_Email_New_Order']->trigger( $order->get_id(), $order, true );
+                remove_filter( 'woocommerce_new_order_email_allows_resend', '__return_true' );
+
+                do_action( 'woocommerce_after_resend_order_email', $order, 'new_order' );
+
+                // Change the post saved message.
+                add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
+
+            } elseif ( 'regenerate_download_permissions' === $action ) {
+
+                $data_store = WC_Data_Store::load( 'customer-download' );
+                $data_store->delete_by_order_id( $post_id );
+                wc_downloadable_product_permissions( $post_id, true );
+
+            } else {
+
+                if ( ! did_action( 'woocommerce_order_action_' . sanitize_title( $action ) ) ) {
+                    do_action( 'woocommerce_order_action_' . sanitize_title( $action ), $order );
+                }
+            }
+        }
+    }
+
+    /**
+     * Set the correct message ID.
+     *
+     * @param string $location Location.
+     * @since  2.3.0
+     * @static
+     * @return string
+     */
+    public static function set_email_sent_message( $location ) {
+        return add_query_arg( 'message', 11, $location );
+    }
+
+    /**
+     * Get the available order actions for a given order.
+     *
+     * @since 5.8.0
+     *
+     * @param WC_Order|null $order The order object or null if no order is available.
+     *
+     * @return array
+     */
+    private static function get_available_order_actions_for_order( $order ) {
+        $actions = array(
+            'send_order_details'              => __( 'Email invoice / order details to customer', 'woocommerce' ),
+            'send_order_details_admin'        => __( 'Resend new order notification', 'woocommerce' ),
+            'regenerate_download_permissions' => __( 'Regenerate download permissions', 'woocommerce' ),
+        );
+
+        /**
+         * Filter: woocommerce_order_actions
+         * Allows filtering of the available order actions for an order.
+         *
+         * @since 2.1.0 Filter was added.
+         * @since 5.8.0 The $order param was added.
+         *
+         * @param array         $actions The available order actions for the order.
+         * @param WC_Order|null $order   The order object or null if no order is available.
+         */
+        return apply_filters( 'woocommerce_order_actions', $actions, $order );
+    }
 }

Spacing +47 added lines, -47 removed lines

@@ -8,7 +8,7 @@ 
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
@@ -22,53 +22,53 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 		global $theorder;
 
 		// This is used by some callbacks attached to hooks such as woocommerce_order_actions which rely on the global to determine if actions should be displayed for certain orders.
 		// Avoid using this global with the `woocommerce_order_actions` filter, instead use the $order filter arg.
-		if ( ! is_object( $theorder ) ) {
-			$theorder = wc_get_order( $post->ID );
+		if (!is_object($theorder)) {
+			$theorder = wc_get_order($post->ID);
 		}
 
 		$theorder = $theorder instanceof WC_Order ? $theorder : null;
-		$order_actions = self::get_available_order_actions_for_order( $theorder );
+		$order_actions = self::get_available_order_actions_for_order($theorder);
 		?>
 		<ul class="order_actions submitbox">
 
-			<?php do_action( 'woocommerce_order_actions_start', $post->ID ); ?>
+			<?php do_action('woocommerce_order_actions_start', $post->ID); ?>
 
 			<li class="wide" id="actions">
 				<select name="wc_order_action">
-					<option value=""><?php esc_html_e( 'Choose an action...', 'woocommerce' ); ?></option>
-					<?php foreach ( $order_actions as $action => $title ) { ?>
-						<option value="<?php echo esc_attr( $action ); ?>"><?php echo esc_html( $title ); ?></option>
+					<option value=""><?php esc_html_e('Choose an action...', 'woocommerce'); ?></option>
+					<?php foreach ($order_actions as $action => $title) { ?>
+						<option value="<?php echo esc_attr($action); ?>"><?php echo esc_html($title); ?></option>
 					<?php } ?>
 				</select>
-				<button class="button wc-reload"><span><?php esc_html_e( 'Apply', 'woocommerce' ); ?></span></button>
+				<button class="button wc-reload"><span><?php esc_html_e('Apply', 'woocommerce'); ?></span></button>
 			</li>
 
 			<li class="wide">
 				<div id="delete-action">
 					<?php
-					if ( current_user_can( 'delete_post', $post->ID ) ) {
+					if (current_user_can('delete_post', $post->ID)) {
 
-						if ( ! EMPTY_TRASH_DAYS ) {
-							$delete_text = __( 'Delete permanently', 'woocommerce' );
+						if (!EMPTY_TRASH_DAYS) {
+							$delete_text = __('Delete permanently', 'woocommerce');
 						} else {
-							$delete_text = __( 'Move to Trash', 'woocommerce' );
+							$delete_text = __('Move to Trash', 'woocommerce');
 						}
 						?>
-						<a class="submitdelete deletion" href="<?php echo esc_url( get_delete_post_link( $post->ID ) ); ?>"><?php echo esc_html( $delete_text ); ?></a>
+						<a class="submitdelete deletion" href="<?php echo esc_url(get_delete_post_link($post->ID)); ?>"><?php echo esc_html($delete_text); ?></a>
 						<?php
 					}
 					?>
 				</div>
 
-				<button type="submit" class="button save_order button-primary" name="save" value="<?php echo 'auto-draft' === $post->post_status ? esc_attr__( 'Create', 'woocommerce' ) : esc_attr__( 'Update', 'woocommerce' ); ?>"><?php echo 'auto-draft' === $post->post_status ? esc_html__( 'Create', 'woocommerce' ) : esc_html__( 'Update', 'woocommerce' ); ?></button>
+				<button type="submit" class="button save_order button-primary" name="save" value="<?php echo 'auto-draft' === $post->post_status ? esc_attr__('Create', 'woocommerce') : esc_attr__('Update', 'woocommerce'); ?>"><?php echo 'auto-draft' === $post->post_status ? esc_html__('Create', 'woocommerce') : esc_html__('Update', 'woocommerce'); ?></button>
 			</li>
 
-			<?php do_action( 'woocommerce_order_actions_end', $post->ID ); ?>
+			<?php do_action('woocommerce_order_actions_end', $post->ID); ?>
 
 		</ul>
 		<?php
@@ -80,56 +80,56 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post Post Object.
 	 */
-	public static function save( $post_id, $post ) {
+	public static function save($post_id, $post) {
 		// Order data saved, now get it so we can manipulate status.
-		$order = wc_get_order( $post_id );
+		$order = wc_get_order($post_id);
 
 		// Handle button actions.
-		if ( ! empty( $_POST['wc_order_action'] ) ) { // @codingStandardsIgnoreLine
+		if (!empty($_POST['wc_order_action'])) { // @codingStandardsIgnoreLine
 
-			$action = wc_clean( wp_unslash( $_POST['wc_order_action'] ) ); // @codingStandardsIgnoreLine
+			$action = wc_clean(wp_unslash($_POST['wc_order_action'])); // @codingStandardsIgnoreLine
 
-			if ( 'send_order_details' === $action ) {
-				do_action( 'woocommerce_before_resend_order_emails', $order, 'customer_invoice' );
+			if ('send_order_details' === $action) {
+				do_action('woocommerce_before_resend_order_emails', $order, 'customer_invoice');
 
 				// Send the customer invoice email.
 				WC()->payment_gateways();
 				WC()->shipping();
-				WC()->mailer()->customer_invoice( $order );
+				WC()->mailer()->customer_invoice($order);
 
 				// Note the event.
-				$order->add_order_note( __( 'Order details manually sent to customer.', 'woocommerce' ), false, true );
+				$order->add_order_note(__('Order details manually sent to customer.', 'woocommerce'), false, true);
 
-				do_action( 'woocommerce_after_resend_order_email', $order, 'customer_invoice' );
+				do_action('woocommerce_after_resend_order_email', $order, 'customer_invoice');
 
 				// Change the post saved message.
-				add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
+				add_filter('redirect_post_location', array(__CLASS__, 'set_email_sent_message'));
 
-			} elseif ( 'send_order_details_admin' === $action ) {
+			} elseif ('send_order_details_admin' === $action) {
 
-				do_action( 'woocommerce_before_resend_order_emails', $order, 'new_order' );
+				do_action('woocommerce_before_resend_order_emails', $order, 'new_order');
 
 				WC()->payment_gateways();
 				WC()->shipping();
-				add_filter( 'woocommerce_new_order_email_allows_resend', '__return_true' );
-				WC()->mailer()->emails['WC_Email_New_Order']->trigger( $order->get_id(), $order, true );
-				remove_filter( 'woocommerce_new_order_email_allows_resend', '__return_true' );
+				add_filter('woocommerce_new_order_email_allows_resend', '__return_true');
+				WC()->mailer()->emails['WC_Email_New_Order']->trigger($order->get_id(), $order, true);
+				remove_filter('woocommerce_new_order_email_allows_resend', '__return_true');
 
-				do_action( 'woocommerce_after_resend_order_email', $order, 'new_order' );
+				do_action('woocommerce_after_resend_order_email', $order, 'new_order');
 
 				// Change the post saved message.
-				add_filter( 'redirect_post_location', array( __CLASS__, 'set_email_sent_message' ) );
+				add_filter('redirect_post_location', array(__CLASS__, 'set_email_sent_message'));
 
-			} elseif ( 'regenerate_download_permissions' === $action ) {
+			} elseif ('regenerate_download_permissions' === $action) {
 
-				$data_store = WC_Data_Store::load( 'customer-download' );
-				$data_store->delete_by_order_id( $post_id );
-				wc_downloadable_product_permissions( $post_id, true );
+				$data_store = WC_Data_Store::load('customer-download');
+				$data_store->delete_by_order_id($post_id);
+				wc_downloadable_product_permissions($post_id, true);
 
 			} else {
 
-				if ( ! did_action( 'woocommerce_order_action_' . sanitize_title( $action ) ) ) {
-					do_action( 'woocommerce_order_action_' . sanitize_title( $action ), $order );
+				if (!did_action('woocommerce_order_action_' . sanitize_title($action))) {
+					do_action('woocommerce_order_action_' . sanitize_title($action), $order);
 				}
 			}
 		}
@@ -143,8 +143,8 @@ 
 	 * @static
 	 * @return string
 	 */
-	public static function set_email_sent_message( $location ) {
-		return add_query_arg( 'message', 11, $location );
+	public static function set_email_sent_message($location) {
+		return add_query_arg('message', 11, $location);
 	}
 
 	/**
@@ -156,11 +156,11 @@ 
 	 *
 	 * @return array
 	 */
-	private static function get_available_order_actions_for_order( $order ) {
+	private static function get_available_order_actions_for_order($order) {
 		$actions = array(
-			'send_order_details'              => __( 'Email invoice / order details to customer', 'woocommerce' ),
-			'send_order_details_admin'        => __( 'Resend new order notification', 'woocommerce' ),
-			'regenerate_download_permissions' => __( 'Regenerate download permissions', 'woocommerce' ),
+			'send_order_details'              => __('Email invoice / order details to customer', 'woocommerce'),
+			'send_order_details_admin'        => __('Resend new order notification', 'woocommerce'),
+			'regenerate_download_permissions' => __('Regenerate download permissions', 'woocommerce'),
 		);
 
 		/**
@@ -173,6 +173,6 @@ 
 		 * @param array         $actions The available order actions for the order.
 		 * @param WC_Order|null $order   The order object or null if no order is available.
 		 */
-		return apply_filters( 'woocommerce_order_actions', $actions, $order );
+		return apply_filters('woocommerce_order_actions', $actions, $order);
 	}
 }

plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-data.php

Indentation +505 added lines, -505 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -19,154 +19,154 @@ 
  */
 class WC_Meta_Box_Order_Data {
 
-	/**
-	 * Billing fields.
-	 *
-	 * @var array
-	 */
-	protected static $billing_fields = array();
-
-	/**
-	 * Shipping fields.
-	 *
-	 * @var array
-	 */
-	protected static $shipping_fields = array();
-
-	/**
-	 * Init billing and shipping fields we display + save.
-	 */
-	public static function init_address_fields() {
-
-		self::$billing_fields = apply_filters(
-			'woocommerce_admin_billing_fields',
-			array(
-				'first_name' => array(
-					'label' => __( 'First name', 'woocommerce' ),
-					'show'  => false,
-				),
-				'last_name'  => array(
-					'label' => __( 'Last name', 'woocommerce' ),
-					'show'  => false,
-				),
-				'company'    => array(
-					'label' => __( 'Company', 'woocommerce' ),
-					'show'  => false,
-				),
-				'address_1'  => array(
-					'label' => __( 'Address line 1', 'woocommerce' ),
-					'show'  => false,
-				),
-				'address_2'  => array(
-					'label' => __( 'Address line 2', 'woocommerce' ),
-					'show'  => false,
-				),
-				'city'       => array(
-					'label' => __( 'City', 'woocommerce' ),
-					'show'  => false,
-				),
-				'postcode'   => array(
-					'label' => __( 'Postcode / ZIP', 'woocommerce' ),
-					'show'  => false,
-				),
-				'country'    => array(
-					'label'   => __( 'Country / Region', 'woocommerce' ),
-					'show'    => false,
-					'class'   => 'js_field-country select short',
-					'type'    => 'select',
-					'options' => array( '' => __( 'Select a country / region…', 'woocommerce' ) ) + WC()->countries->get_allowed_countries(),
-				),
-				'state'      => array(
-					'label' => __( 'State / County', 'woocommerce' ),
-					'class' => 'js_field-state select short',
-					'show'  => false,
-				),
-				'email'      => array(
-					'label' => __( 'Email address', 'woocommerce' ),
-				),
-				'phone'      => array(
-					'label' => __( 'Phone', 'woocommerce' ),
-				),
-			)
-		);
-
-		self::$shipping_fields = apply_filters(
-			'woocommerce_admin_shipping_fields',
-			array(
-				'first_name' => array(
-					'label' => __( 'First name', 'woocommerce' ),
-					'show'  => false,
-				),
-				'last_name'  => array(
-					'label' => __( 'Last name', 'woocommerce' ),
-					'show'  => false,
-				),
-				'company'    => array(
-					'label' => __( 'Company', 'woocommerce' ),
-					'show'  => false,
-				),
-				'address_1'  => array(
-					'label' => __( 'Address line 1', 'woocommerce' ),
-					'show'  => false,
-				),
-				'address_2'  => array(
-					'label' => __( 'Address line 2', 'woocommerce' ),
-					'show'  => false,
-				),
-				'city'       => array(
-					'label' => __( 'City', 'woocommerce' ),
-					'show'  => false,
-				),
-				'postcode'   => array(
-					'label' => __( 'Postcode / ZIP', 'woocommerce' ),
-					'show'  => false,
-				),
-				'country'    => array(
-					'label'   => __( 'Country / Region', 'woocommerce' ),
-					'show'    => false,
-					'type'    => 'select',
-					'class'   => 'js_field-country select short',
-					'options' => array( '' => __( 'Select a country / region…', 'woocommerce' ) ) + WC()->countries->get_shipping_countries(),
-				),
-				'state'      => array(
-					'label' => __( 'State / County', 'woocommerce' ),
-					'class' => 'js_field-state select short',
-					'show'  => false,
-				),
-				'phone'      => array(
-					'label' => __( 'Phone', 'woocommerce' ),
-				),
-			)
-		);
-	}
-
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
-		global $theorder;
-
-		if ( ! is_object( $theorder ) ) {
-			$theorder = wc_get_order( $post->ID );
-		}
-
-		$order = $theorder;
-
-		self::init_address_fields();
-
-		if ( WC()->payment_gateways() ) {
-			$payment_gateways = WC()->payment_gateways->payment_gateways();
-		} else {
-			$payment_gateways = array();
-		}
-
-		$payment_method = $order->get_payment_method();
-
-		$order_type_object = get_post_type_object( $post->post_type );
-		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
-		?>
+    /**
+     * Billing fields.
+     *
+     * @var array
+     */
+    protected static $billing_fields = array();
+
+    /**
+     * Shipping fields.
+     *
+     * @var array
+     */
+    protected static $shipping_fields = array();
+
+    /**
+     * Init billing and shipping fields we display + save.
+     */
+    public static function init_address_fields() {
+
+        self::$billing_fields = apply_filters(
+            'woocommerce_admin_billing_fields',
+            array(
+                'first_name' => array(
+                    'label' => __( 'First name', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'last_name'  => array(
+                    'label' => __( 'Last name', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'company'    => array(
+                    'label' => __( 'Company', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'address_1'  => array(
+                    'label' => __( 'Address line 1', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'address_2'  => array(
+                    'label' => __( 'Address line 2', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'city'       => array(
+                    'label' => __( 'City', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'postcode'   => array(
+                    'label' => __( 'Postcode / ZIP', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'country'    => array(
+                    'label'   => __( 'Country / Region', 'woocommerce' ),
+                    'show'    => false,
+                    'class'   => 'js_field-country select short',
+                    'type'    => 'select',
+                    'options' => array( '' => __( 'Select a country / region…', 'woocommerce' ) ) + WC()->countries->get_allowed_countries(),
+                ),
+                'state'      => array(
+                    'label' => __( 'State / County', 'woocommerce' ),
+                    'class' => 'js_field-state select short',
+                    'show'  => false,
+                ),
+                'email'      => array(
+                    'label' => __( 'Email address', 'woocommerce' ),
+                ),
+                'phone'      => array(
+                    'label' => __( 'Phone', 'woocommerce' ),
+                ),
+            )
+        );
+
+        self::$shipping_fields = apply_filters(
+            'woocommerce_admin_shipping_fields',
+            array(
+                'first_name' => array(
+                    'label' => __( 'First name', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'last_name'  => array(
+                    'label' => __( 'Last name', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'company'    => array(
+                    'label' => __( 'Company', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'address_1'  => array(
+                    'label' => __( 'Address line 1', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'address_2'  => array(
+                    'label' => __( 'Address line 2', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'city'       => array(
+                    'label' => __( 'City', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'postcode'   => array(
+                    'label' => __( 'Postcode / ZIP', 'woocommerce' ),
+                    'show'  => false,
+                ),
+                'country'    => array(
+                    'label'   => __( 'Country / Region', 'woocommerce' ),
+                    'show'    => false,
+                    'type'    => 'select',
+                    'class'   => 'js_field-country select short',
+                    'options' => array( '' => __( 'Select a country / region…', 'woocommerce' ) ) + WC()->countries->get_shipping_countries(),
+                ),
+                'state'      => array(
+                    'label' => __( 'State / County', 'woocommerce' ),
+                    'class' => 'js_field-state select short',
+                    'show'  => false,
+                ),
+                'phone'      => array(
+                    'label' => __( 'Phone', 'woocommerce' ),
+                ),
+            )
+        );
+    }
+
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
+        global $theorder;
+
+        if ( ! is_object( $theorder ) ) {
+            $theorder = wc_get_order( $post->ID );
+        }
+
+        $order = $theorder;
+
+        self::init_address_fields();
+
+        if ( WC()->payment_gateways() ) {
+            $payment_gateways = WC()->payment_gateways->payment_gateways();
+        } else {
+            $payment_gateways = array();
+        }
+
+        $payment_method = $order->get_payment_method();
+
+        $order_type_object = get_post_type_object( $post->post_type );
+        wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+        ?>
 		<style type="text/css">
 			#post-body-content, #titlediv { display:none }
 		</style>
@@ -177,58 +177,58 @@ 
 				<h2 class="woocommerce-order-data__heading">
 					<?php
 
-					/* translators: 1: order type 2: order number */
-					printf(
-						esc_html__( '%1$s #%2$s details', 'woocommerce' ),
-						esc_html( $order_type_object->labels->singular_name ),
-						esc_html( $order->get_order_number() )
-					);
+                    /* translators: 1: order type 2: order number */
+                    printf(
+                        esc_html__( '%1$s #%2$s details', 'woocommerce' ),
+                        esc_html( $order_type_object->labels->singular_name ),
+                        esc_html( $order->get_order_number() )
+                    );
 
-					?>
+                    ?>
 				</h2>
 				<p class="woocommerce-order-data__meta order_number">
 					<?php
 
-					$meta_list = array();
-
-					if ( $payment_method && 'other' !== $payment_method ) {
-						/* translators: %s: payment method */
-						$payment_method_string = sprintf(
-							__( 'Payment via %s', 'woocommerce' ),
-							esc_html( isset( $payment_gateways[ $payment_method ] ) ? $payment_gateways[ $payment_method ]->get_title() : $payment_method )
-						);
-
-						if ( $transaction_id = $order->get_transaction_id() ) {
-							if ( isset( $payment_gateways[ $payment_method ] ) && ( $url = $payment_gateways[ $payment_method ]->get_transaction_url( $order ) ) ) {
-								$payment_method_string .= ' (<a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $transaction_id ) . '</a>)';
-							} else {
-								$payment_method_string .= ' (' . esc_html( $transaction_id ) . ')';
-							}
-						}
-
-						$meta_list[] = $payment_method_string;
-					}
-
-					if ( $order->get_date_paid() ) {
-						/* translators: 1: date 2: time */
-						$meta_list[] = sprintf(
-							__( 'Paid on %1$s @ %2$s', 'woocommerce' ),
-							wc_format_datetime( $order->get_date_paid() ),
-							wc_format_datetime( $order->get_date_paid(), get_option( 'time_format' ) )
-						);
-					}
-
-					if ( $ip_address = $order->get_customer_ip_address() ) {
-						/* translators: %s: IP address */
-						$meta_list[] = sprintf(
-							__( 'Customer IP: %s', 'woocommerce' ),
-							'<span class="woocommerce-Order-customerIP">' . esc_html( $ip_address ) . '</span>'
-						);
-					}
-
-					echo wp_kses_post( implode( '. ', $meta_list ) );
-
-					?>
+                    $meta_list = array();
+
+                    if ( $payment_method && 'other' !== $payment_method ) {
+                        /* translators: %s: payment method */
+                        $payment_method_string = sprintf(
+                            __( 'Payment via %s', 'woocommerce' ),
+                            esc_html( isset( $payment_gateways[ $payment_method ] ) ? $payment_gateways[ $payment_method ]->get_title() : $payment_method )
+                        );
+
+                        if ( $transaction_id = $order->get_transaction_id() ) {
+                            if ( isset( $payment_gateways[ $payment_method ] ) && ( $url = $payment_gateways[ $payment_method ]->get_transaction_url( $order ) ) ) {
+                                $payment_method_string .= ' (<a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $transaction_id ) . '</a>)';
+                            } else {
+                                $payment_method_string .= ' (' . esc_html( $transaction_id ) . ')';
+                            }
+                        }
+
+                        $meta_list[] = $payment_method_string;
+                    }
+
+                    if ( $order->get_date_paid() ) {
+                        /* translators: 1: date 2: time */
+                        $meta_list[] = sprintf(
+                            __( 'Paid on %1$s @ %2$s', 'woocommerce' ),
+                            wc_format_datetime( $order->get_date_paid() ),
+                            wc_format_datetime( $order->get_date_paid(), get_option( 'time_format' ) )
+                        );
+                    }
+
+                    if ( $ip_address = $order->get_customer_ip_address() ) {
+                        /* translators: %s: IP address */
+                        $meta_list[] = sprintf(
+                            __( 'Customer IP: %s', 'woocommerce' ),
+                            '<span class="woocommerce-Order-customerIP">' . esc_html( $ip_address ) . '</span>'
+                        );
+                    }
+
+                    echo wp_kses_post( implode( '. ', $meta_list ) );
+
+                    ?>
 				</p>
 				<div class="order_data_column_container">
 					<div class="order_data_column">
@@ -246,23 +246,23 @@ 
 						<p class="form-field form-field-wide wc-order-status">
 							<label for="order_status">
 								<?php
-								_e( 'Status:', 'woocommerce' );
-								if ( $order->needs_payment() ) {
-									printf(
-										'<a href="%s">%s</a>',
-										esc_url( $order->get_checkout_payment_url() ),
-										__( 'Customer payment page &rarr;', 'woocommerce' )
-									);
-								}
-								?>
+                                _e( 'Status:', 'woocommerce' );
+                                if ( $order->needs_payment() ) {
+                                    printf(
+                                        '<a href="%s">%s</a>',
+                                        esc_url( $order->get_checkout_payment_url() ),
+                                        __( 'Customer payment page &rarr;', 'woocommerce' )
+                                    );
+                                }
+                                ?>
 							</label>
 							<select id="order_status" name="order_status" class="wc-enhanced-select">
 								<?php
-								$statuses = wc_get_order_statuses();
-								foreach ( $statuses as $status => $status_name ) {
-									echo '<option value="' . esc_attr( $status ) . '" ' . selected( $status, 'wc-' . $order->get_status( 'edit' ), false ) . '>' . esc_html( $status_name ) . '</option>';
-								}
-								?>
+                                $statuses = wc_get_order_statuses();
+                                foreach ( $statuses as $status => $status_name ) {
+                                    echo '<option value="' . esc_attr( $status ) . '" ' . selected( $status, 'wc-' . $order->get_status( 'edit' ), false ) . '>' . esc_html( $status_name ) . '</option>';
+                                }
+                                ?>
 							</select>
 						</p>
 
@@ -270,41 +270,41 @@ 
 							<!--email_off--> <!-- Disable CloudFlare email obfuscation -->
 							<label for="customer_user">
 								<?php
-								_e( 'Customer:', 'woocommerce' );
-								if ( $order->get_user_id( 'edit' ) ) {
-									$args = array(
-										'post_status'    => 'all',
-										'post_type'      => 'shop_order',
-										'_customer_user' => $order->get_user_id( 'edit' ),
-									);
-									printf(
-										'<a href="%s">%s</a>',
-										esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ),
-										' ' . __( 'View other orders &rarr;', 'woocommerce' )
-									);
-									printf(
-										'<a href="%s">%s</a>',
-										esc_url( add_query_arg( 'user_id', $order->get_user_id( 'edit' ), admin_url( 'user-edit.php' ) ) ),
-										' ' . __( 'Profile &rarr;', 'woocommerce' )
-									);
-								}
-								?>
+                                _e( 'Customer:', 'woocommerce' );
+                                if ( $order->get_user_id( 'edit' ) ) {
+                                    $args = array(
+                                        'post_status'    => 'all',
+                                        'post_type'      => 'shop_order',
+                                        '_customer_user' => $order->get_user_id( 'edit' ),
+                                    );
+                                    printf(
+                                        '<a href="%s">%s</a>',
+                                        esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ),
+                                        ' ' . __( 'View other orders &rarr;', 'woocommerce' )
+                                    );
+                                    printf(
+                                        '<a href="%s">%s</a>',
+                                        esc_url( add_query_arg( 'user_id', $order->get_user_id( 'edit' ), admin_url( 'user-edit.php' ) ) ),
+                                        ' ' . __( 'Profile &rarr;', 'woocommerce' )
+                                    );
+                                }
+                                ?>
 							</label>
 							<?php
-							$user_string = '';
-							$user_id     = '';
-							if ( $order->get_user_id() ) {
-								$user_id = absint( $order->get_user_id() );
-								$user    = get_user_by( 'id', $user_id );
-								/* translators: 1: user display name 2: user ID 3: user email */
-								$user_string = sprintf(
-									esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
-									$user->display_name,
-									absint( $user->ID ),
-									$user->user_email
-								);
-							}
-							?>
+                            $user_string = '';
+                            $user_id     = '';
+                            if ( $order->get_user_id() ) {
+                                $user_id = absint( $order->get_user_id() );
+                                $user    = get_user_by( 'id', $user_id );
+                                /* translators: 1: user display name 2: user ID 3: user email */
+                                $user_string = sprintf(
+                                    esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
+                                    $user->display_name,
+                                    absint( $user->ID ),
+                                    $user->user_email
+                                );
+                            }
+                            ?>
 							<select class="wc-customer-search" id="customer_user" name="customer_user" data-placeholder="<?php esc_attr_e( 'Guest', 'woocommerce' ); ?>" data-allow_clear="true">
 								<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo htmlspecialchars( wp_kses_post( $user_string ) ); // htmlspecialchars to prevent XSS when rendered by selectWoo. ?></option>
 							</select>
@@ -323,109 +323,109 @@ 
 						<div class="address">
 							<?php
 
-							// Display values.
-							if ( $order->get_formatted_billing_address() ) {
-								echo '<p>' . wp_kses( $order->get_formatted_billing_address(), array( 'br' => array() ) ) . '</p>';
-							} else {
-								echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No billing address set.', 'woocommerce' ) . '</p>';
-							}
-
-							foreach ( self::$billing_fields as $key => $field ) {
-								if ( isset( $field['show'] ) && false === $field['show'] ) {
-									continue;
-								}
-
-								$field_name = 'billing_' . $key;
-
-								if ( isset( $field['value'] ) ) {
-									$field_value = $field['value'];
-								} elseif ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-									$field_value = $order->{"get_$field_name"}( 'edit' );
-								} else {
-									$field_value = $order->get_meta( '_' . $field_name );
-								}
-
-								if ( 'billing_phone' === $field_name ) {
-									$field_value = wc_make_phone_clickable( $field_value );
-								} elseif ( 'billing_email' === $field_name ) {
-									$field_value = '<a href="' . esc_url( 'mailto:' . $field_value ) . '">' . $field_value . '</a>';
-								} else {
-									$field_value = make_clickable( esc_html( $field_value ) );
-								}
-
-								if ( $field_value ) {
-									echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . wp_kses_post( $field_value ) . '</p>';
-								}
-							}
-							?>
+                            // Display values.
+                            if ( $order->get_formatted_billing_address() ) {
+                                echo '<p>' . wp_kses( $order->get_formatted_billing_address(), array( 'br' => array() ) ) . '</p>';
+                            } else {
+                                echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No billing address set.', 'woocommerce' ) . '</p>';
+                            }
+
+                            foreach ( self::$billing_fields as $key => $field ) {
+                                if ( isset( $field['show'] ) && false === $field['show'] ) {
+                                    continue;
+                                }
+
+                                $field_name = 'billing_' . $key;
+
+                                if ( isset( $field['value'] ) ) {
+                                    $field_value = $field['value'];
+                                } elseif ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
+                                    $field_value = $order->{"get_$field_name"}( 'edit' );
+                                } else {
+                                    $field_value = $order->get_meta( '_' . $field_name );
+                                }
+
+                                if ( 'billing_phone' === $field_name ) {
+                                    $field_value = wc_make_phone_clickable( $field_value );
+                                } elseif ( 'billing_email' === $field_name ) {
+                                    $field_value = '<a href="' . esc_url( 'mailto:' . $field_value ) . '">' . $field_value . '</a>';
+                                } else {
+                                    $field_value = make_clickable( esc_html( $field_value ) );
+                                }
+
+                                if ( $field_value ) {
+                                    echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . wp_kses_post( $field_value ) . '</p>';
+                                }
+                            }
+                            ?>
 						</div>
 
 						<div class="edit_address">
 							<?php
 
-							// Display form.
-							foreach ( self::$billing_fields as $key => $field ) {
-								if ( ! isset( $field['type'] ) ) {
-									$field['type'] = 'text';
-								}
-								if ( ! isset( $field['id'] ) ) {
-									$field['id'] = '_billing_' . $key;
-								}
-
-								$field_name = 'billing_' . $key;
-
-								if ( ! isset( $field['value'] ) ) {
-									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-										$field['value'] = $order->{"get_$field_name"}( 'edit' );
-									} else {
-										$field['value'] = $order->get_meta( '_' . $field_name );
-									}
-								}
-
-								switch ( $field['type'] ) {
-									case 'select':
-										woocommerce_wp_select( $field );
-										break;
-									default:
-										woocommerce_wp_text_input( $field );
-										break;
-								}
-							}
-							?>
+                            // Display form.
+                            foreach ( self::$billing_fields as $key => $field ) {
+                                if ( ! isset( $field['type'] ) ) {
+                                    $field['type'] = 'text';
+                                }
+                                if ( ! isset( $field['id'] ) ) {
+                                    $field['id'] = '_billing_' . $key;
+                                }
+
+                                $field_name = 'billing_' . $key;
+
+                                if ( ! isset( $field['value'] ) ) {
+                                    if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
+                                        $field['value'] = $order->{"get_$field_name"}( 'edit' );
+                                    } else {
+                                        $field['value'] = $order->get_meta( '_' . $field_name );
+                                    }
+                                }
+
+                                switch ( $field['type'] ) {
+                                    case 'select':
+                                        woocommerce_wp_select( $field );
+                                        break;
+                                    default:
+                                        woocommerce_wp_text_input( $field );
+                                        break;
+                                }
+                            }
+                            ?>
 							<p class="form-field form-field-wide">
 								<label><?php esc_html_e( 'Payment method:', 'woocommerce' ); ?></label>
 								<select name="_payment_method" id="_payment_method" class="first">
 									<option value=""><?php esc_html_e( 'N/A', 'woocommerce' ); ?></option>
 									<?php
-									$found_method = false;
-
-									foreach ( $payment_gateways as $gateway ) {
-										if ( 'yes' === $gateway->enabled ) {
-											echo '<option value="' . esc_attr( $gateway->id ) . '" ' . selected( $payment_method, $gateway->id, false ) . '>' . esc_html( $gateway->get_title() ) . '</option>';
-											if ( $payment_method == $gateway->id ) {
-												$found_method = true;
-											}
-										}
-									}
-
-									if ( ! $found_method && ! empty( $payment_method ) ) {
-										echo '<option value="' . esc_attr( $payment_method ) . '" selected="selected">' . esc_html__( 'Other', 'woocommerce' ) . '</option>';
-									} else {
-										echo '<option value="other">' . esc_html__( 'Other', 'woocommerce' ) . '</option>';
-									}
-									?>
+                                    $found_method = false;
+
+                                    foreach ( $payment_gateways as $gateway ) {
+                                        if ( 'yes' === $gateway->enabled ) {
+                                            echo '<option value="' . esc_attr( $gateway->id ) . '" ' . selected( $payment_method, $gateway->id, false ) . '>' . esc_html( $gateway->get_title() ) . '</option>';
+                                            if ( $payment_method == $gateway->id ) {
+                                                $found_method = true;
+                                            }
+                                        }
+                                    }
+
+                                    if ( ! $found_method && ! empty( $payment_method ) ) {
+                                        echo '<option value="' . esc_attr( $payment_method ) . '" selected="selected">' . esc_html__( 'Other', 'woocommerce' ) . '</option>';
+                                    } else {
+                                        echo '<option value="other">' . esc_html__( 'Other', 'woocommerce' ) . '</option>';
+                                    }
+                                    ?>
 								</select>
 							</p>
 							<?php
 
-							woocommerce_wp_text_input(
-								array(
-									'id'    => '_transaction_id',
-									'label' => __( 'Transaction ID', 'woocommerce' ),
-									'value' => $order->get_transaction_id( 'edit' ),
-								)
-							);
-							?>
+                            woocommerce_wp_text_input(
+                                array(
+                                    'id'    => '_transaction_id',
+                                    'label' => __( 'Transaction ID', 'woocommerce' ),
+                                    'value' => $order->get_transaction_id( 'edit' ),
+                                )
+                            );
+                            ?>
 
 						</div>
 						<?php do_action( 'woocommerce_admin_order_data_after_billing_address', $order ); ?>
@@ -442,76 +442,76 @@ 
 						<div class="address">
 							<?php
 
-							// Display values.
-							if ( $order->get_formatted_shipping_address() ) {
-								echo '<p>' . wp_kses( $order->get_formatted_shipping_address(), array( 'br' => array() ) ) . '</p>';
-							} else {
-								echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No shipping address set.', 'woocommerce' ) . '</p>';
-							}
-
-							if ( ! empty( self::$shipping_fields ) ) {
-								foreach ( self::$shipping_fields as $key => $field ) {
-									if ( isset( $field['show'] ) && false === $field['show'] ) {
-										continue;
-									}
-
-									$field_name = 'shipping_' . $key;
-
-									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-										$field_value = $order->{"get_$field_name"}( 'edit' );
-									} else {
-										$field_value = $order->get_meta( '_' . $field_name );
-									}
-
-									if ( 'shipping_phone' === $field_name ) {
-										$field_value = wc_make_phone_clickable( $field_value );
-									}
-
-									if ( $field_value ) {
-										echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . wp_kses_post( $field_value ) . '</p>';
-									}
-								}
-							}
-
-							if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) && $post->post_excerpt ) {
-								echo '<p class="order_note"><strong>' . __( 'Customer provided note:', 'woocommerce' ) . '</strong> ' . nl2br( esc_html( $post->post_excerpt ) ) . '</p>';
-							}
-							?>
+                            // Display values.
+                            if ( $order->get_formatted_shipping_address() ) {
+                                echo '<p>' . wp_kses( $order->get_formatted_shipping_address(), array( 'br' => array() ) ) . '</p>';
+                            } else {
+                                echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No shipping address set.', 'woocommerce' ) . '</p>';
+                            }
+
+                            if ( ! empty( self::$shipping_fields ) ) {
+                                foreach ( self::$shipping_fields as $key => $field ) {
+                                    if ( isset( $field['show'] ) && false === $field['show'] ) {
+                                        continue;
+                                    }
+
+                                    $field_name = 'shipping_' . $key;
+
+                                    if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
+                                        $field_value = $order->{"get_$field_name"}( 'edit' );
+                                    } else {
+                                        $field_value = $order->get_meta( '_' . $field_name );
+                                    }
+
+                                    if ( 'shipping_phone' === $field_name ) {
+                                        $field_value = wc_make_phone_clickable( $field_value );
+                                    }
+
+                                    if ( $field_value ) {
+                                        echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . wp_kses_post( $field_value ) . '</p>';
+                                    }
+                                }
+                            }
+
+                            if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) && $post->post_excerpt ) {
+                                echo '<p class="order_note"><strong>' . __( 'Customer provided note:', 'woocommerce' ) . '</strong> ' . nl2br( esc_html( $post->post_excerpt ) ) . '</p>';
+                            }
+                            ?>
 						</div>
 						<div class="edit_address">
 							<?php
 
-							// Display form.
-							if ( ! empty( self::$shipping_fields ) ) {
-								foreach ( self::$shipping_fields as $key => $field ) {
-									if ( ! isset( $field['type'] ) ) {
-										$field['type'] = 'text';
-									}
-									if ( ! isset( $field['id'] ) ) {
-										$field['id'] = '_shipping_' . $key;
-									}
-
-									$field_name = 'shipping_' . $key;
-
-									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-										$field['value'] = $order->{"get_$field_name"}( 'edit' );
-									} else {
-										$field['value'] = $order->get_meta( '_' . $field_name );
-									}
-
-									switch ( $field['type'] ) {
-										case 'select':
-											woocommerce_wp_select( $field );
-											break;
-										default:
-											woocommerce_wp_text_input( $field );
-											break;
-									}
-								}
-							}
-
-							if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) ) :
-								?>
+                            // Display form.
+                            if ( ! empty( self::$shipping_fields ) ) {
+                                foreach ( self::$shipping_fields as $key => $field ) {
+                                    if ( ! isset( $field['type'] ) ) {
+                                        $field['type'] = 'text';
+                                    }
+                                    if ( ! isset( $field['id'] ) ) {
+                                        $field['id'] = '_shipping_' . $key;
+                                    }
+
+                                    $field_name = 'shipping_' . $key;
+
+                                    if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
+                                        $field['value'] = $order->{"get_$field_name"}( 'edit' );
+                                    } else {
+                                        $field['value'] = $order->get_meta( '_' . $field_name );
+                                    }
+
+                                    switch ( $field['type'] ) {
+                                        case 'select':
+                                            woocommerce_wp_select( $field );
+                                            break;
+                                        default:
+                                            woocommerce_wp_text_input( $field );
+                                            break;
+                                    }
+                                }
+                            }
+
+                            if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) ) :
+                                ?>
 								<p class="form-field form-field-wide">
 									<label for="excerpt"><?php _e( 'Customer provided note', 'woocommerce' ); ?>:</label>
 									<textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt" placeholder="<?php esc_attr_e( 'Customer notes about the order', 'woocommerce' ); ?>"><?php echo wp_kses_post( $post->post_excerpt ); ?></textarea>
@@ -526,112 +526,112 @@ 
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int $order_id Order ID.
-	 */
-	public static function save( $order_id ) {
-		self::init_address_fields();
-
-		// Ensure gateways are loaded in case they need to insert data into the emails.
-		WC()->payment_gateways();
-		WC()->shipping();
-
-		// Get order object.
-		$order = wc_get_order( $order_id );
-		$props = array();
-
-		// Create order key.
-		if ( ! $order->get_order_key() ) {
-			$props['order_key'] = wc_generate_order_key();
-		}
-
-		// Update customer.
-		$customer_id = isset( $_POST['customer_user'] ) ? absint( $_POST['customer_user'] ) : 0;
-		if ( $customer_id !== $order->get_customer_id() ) {
-			$props['customer_id'] = $customer_id;
-		}
-
-		// Update billing fields.
-		if ( ! empty( self::$billing_fields ) ) {
-			foreach ( self::$billing_fields as $key => $field ) {
-				if ( ! isset( $field['id'] ) ) {
-					$field['id'] = '_billing_' . $key;
-				}
-
-				if ( ! isset( $_POST[ $field['id'] ] ) ) {
-					continue;
-				}
-
-				if ( is_callable( array( $order, 'set_billing_' . $key ) ) ) {
-					$props[ 'billing_' . $key ] = wc_clean( wp_unslash( $_POST[ $field['id'] ] ) );
-				} else {
-					$order->update_meta_data( $field['id'], wc_clean( wp_unslash( $_POST[ $field['id'] ] ) ) );
-				}
-			}
-		}
-
-		// Update shipping fields.
-		if ( ! empty( self::$shipping_fields ) ) {
-			foreach ( self::$shipping_fields as $key => $field ) {
-				if ( ! isset( $field['id'] ) ) {
-					$field['id'] = '_shipping_' . $key;
-				}
-
-				if ( ! isset( $_POST[ $field['id'] ] ) ) {
-					continue;
-				}
-
-				if ( is_callable( array( $order, 'set_shipping_' . $key ) ) ) {
-					$props[ 'shipping_' . $key ] = wc_clean( wp_unslash( $_POST[ $field['id'] ] ) );
-				} else {
-					$order->update_meta_data( $field['id'], wc_clean( wp_unslash( $_POST[ $field['id'] ] ) ) );
-				}
-			}
-		}
-
-		if ( isset( $_POST['_transaction_id'] ) ) {
-			$props['transaction_id'] = wc_clean( wp_unslash( $_POST['_transaction_id'] ) );
-		}
-
-		// Payment method handling.
-		if ( $order->get_payment_method() !== wp_unslash( $_POST['_payment_method'] ) ) {
-			$methods              = WC()->payment_gateways->payment_gateways();
-			$payment_method       = wc_clean( wp_unslash( $_POST['_payment_method'] ) );
-			$payment_method_title = $payment_method;
-
-			if ( isset( $methods ) && isset( $methods[ $payment_method ] ) ) {
-				$payment_method_title = $methods[ $payment_method ]->get_title();
-			}
-
-			if ( $payment_method == 'other') {
-				$payment_method_title = esc_html__( 'Other', 'woocommerce' );
-			}
+    }
+
+    /**
+     * Save meta box data.
+     *
+     * @param int $order_id Order ID.
+     */
+    public static function save( $order_id ) {
+        self::init_address_fields();
+
+        // Ensure gateways are loaded in case they need to insert data into the emails.
+        WC()->payment_gateways();
+        WC()->shipping();
+
+        // Get order object.
+        $order = wc_get_order( $order_id );
+        $props = array();
+
+        // Create order key.
+        if ( ! $order->get_order_key() ) {
+            $props['order_key'] = wc_generate_order_key();
+        }
+
+        // Update customer.
+        $customer_id = isset( $_POST['customer_user'] ) ? absint( $_POST['customer_user'] ) : 0;
+        if ( $customer_id !== $order->get_customer_id() ) {
+            $props['customer_id'] = $customer_id;
+        }
+
+        // Update billing fields.
+        if ( ! empty( self::$billing_fields ) ) {
+            foreach ( self::$billing_fields as $key => $field ) {
+                if ( ! isset( $field['id'] ) ) {
+                    $field['id'] = '_billing_' . $key;
+                }
+
+                if ( ! isset( $_POST[ $field['id'] ] ) ) {
+                    continue;
+                }
+
+                if ( is_callable( array( $order, 'set_billing_' . $key ) ) ) {
+                    $props[ 'billing_' . $key ] = wc_clean( wp_unslash( $_POST[ $field['id'] ] ) );
+                } else {
+                    $order->update_meta_data( $field['id'], wc_clean( wp_unslash( $_POST[ $field['id'] ] ) ) );
+                }
+            }
+        }
+
+        // Update shipping fields.
+        if ( ! empty( self::$shipping_fields ) ) {
+            foreach ( self::$shipping_fields as $key => $field ) {
+                if ( ! isset( $field['id'] ) ) {
+                    $field['id'] = '_shipping_' . $key;
+                }
+
+                if ( ! isset( $_POST[ $field['id'] ] ) ) {
+                    continue;
+                }
+
+                if ( is_callable( array( $order, 'set_shipping_' . $key ) ) ) {
+                    $props[ 'shipping_' . $key ] = wc_clean( wp_unslash( $_POST[ $field['id'] ] ) );
+                } else {
+                    $order->update_meta_data( $field['id'], wc_clean( wp_unslash( $_POST[ $field['id'] ] ) ) );
+                }
+            }
+        }
+
+        if ( isset( $_POST['_transaction_id'] ) ) {
+            $props['transaction_id'] = wc_clean( wp_unslash( $_POST['_transaction_id'] ) );
+        }
+
+        // Payment method handling.
+        if ( $order->get_payment_method() !== wp_unslash( $_POST['_payment_method'] ) ) {
+            $methods              = WC()->payment_gateways->payment_gateways();
+            $payment_method       = wc_clean( wp_unslash( $_POST['_payment_method'] ) );
+            $payment_method_title = $payment_method;
+
+            if ( isset( $methods ) && isset( $methods[ $payment_method ] ) ) {
+                $payment_method_title = $methods[ $payment_method ]->get_title();
+            }
+
+            if ( $payment_method == 'other') {
+                $payment_method_title = esc_html__( 'Other', 'woocommerce' );
+            }
 			
-			$props['payment_method']       = $payment_method;
-			$props['payment_method_title'] = $payment_method_title;
-		}
-
-		// Update date.
-		if ( empty( $_POST['order_date'] ) ) {
-			$date = time();
-		} else {
-			$date = gmdate( 'Y-m-d H:i:s', strtotime( $_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':' . (int) $_POST['order_date_second'] ) );
-		}
-
-		$props['date_created'] = $date;
-
-		// Set created via prop if new post.
-		if ( isset( $_POST['original_post_status'] ) && $_POST['original_post_status'] === 'auto-draft' ) {
-			$props['created_via'] = 'admin';
-		}
-
-		// Save order data.
-		$order->set_props( $props );
-		$order->set_status( wc_clean( wp_unslash( $_POST['order_status'] ) ), '', true );
-		$order->save();
-	}
+            $props['payment_method']       = $payment_method;
+            $props['payment_method_title'] = $payment_method_title;
+        }
+
+        // Update date.
+        if ( empty( $_POST['order_date'] ) ) {
+            $date = time();
+        } else {
+            $date = gmdate( 'Y-m-d H:i:s', strtotime( $_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':' . (int) $_POST['order_date_second'] ) );
+        }
+
+        $props['date_created'] = $date;
+
+        // Set created via prop if new post.
+        if ( isset( $_POST['original_post_status'] ) && $_POST['original_post_status'] === 'auto-draft' ) {
+            $props['created_via'] = 'admin';
+        }
+
+        // Save order data.
+        $order->set_props( $props );
+        $order->set_status( wc_clean( wp_unslash( $_POST['order_status'] ) ), '', true );
+        $order->save();
+    }
 }

Spacing +183 added lines, -183 removed lines

@@ -10,7 +10,7 @@ 
  * @version     2.2.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -42,50 +42,50 @@ 
 			'woocommerce_admin_billing_fields',
 			array(
 				'first_name' => array(
-					'label' => __( 'First name', 'woocommerce' ),
+					'label' => __('First name', 'woocommerce'),
 					'show'  => false,
 				),
 				'last_name'  => array(
-					'label' => __( 'Last name', 'woocommerce' ),
+					'label' => __('Last name', 'woocommerce'),
 					'show'  => false,
 				),
 				'company'    => array(
-					'label' => __( 'Company', 'woocommerce' ),
+					'label' => __('Company', 'woocommerce'),
 					'show'  => false,
 				),
 				'address_1'  => array(
-					'label' => __( 'Address line 1', 'woocommerce' ),
+					'label' => __('Address line 1', 'woocommerce'),
 					'show'  => false,
 				),
 				'address_2'  => array(
-					'label' => __( 'Address line 2', 'woocommerce' ),
+					'label' => __('Address line 2', 'woocommerce'),
 					'show'  => false,
 				),
 				'city'       => array(
-					'label' => __( 'City', 'woocommerce' ),
+					'label' => __('City', 'woocommerce'),
 					'show'  => false,
 				),
 				'postcode'   => array(
-					'label' => __( 'Postcode / ZIP', 'woocommerce' ),
+					'label' => __('Postcode / ZIP', 'woocommerce'),
 					'show'  => false,
 				),
 				'country'    => array(
-					'label'   => __( 'Country / Region', 'woocommerce' ),
+					'label'   => __('Country / Region', 'woocommerce'),
 					'show'    => false,
 					'class'   => 'js_field-country select short',
 					'type'    => 'select',
-					'options' => array( '' => __( 'Select a country / region…', 'woocommerce' ) ) + WC()->countries->get_allowed_countries(),
+					'options' => array('' => __('Select a country / region…', 'woocommerce')) + WC()->countries->get_allowed_countries(),
 				),
 				'state'      => array(
-					'label' => __( 'State / County', 'woocommerce' ),
+					'label' => __('State / County', 'woocommerce'),
 					'class' => 'js_field-state select short',
 					'show'  => false,
 				),
 				'email'      => array(
-					'label' => __( 'Email address', 'woocommerce' ),
+					'label' => __('Email address', 'woocommerce'),
 				),
 				'phone'      => array(
-					'label' => __( 'Phone', 'woocommerce' ),
+					'label' => __('Phone', 'woocommerce'),
 				),
 			)
 		);
@@ -94,47 +94,47 @@ 
 			'woocommerce_admin_shipping_fields',
 			array(
 				'first_name' => array(
-					'label' => __( 'First name', 'woocommerce' ),
+					'label' => __('First name', 'woocommerce'),
 					'show'  => false,
 				),
 				'last_name'  => array(
-					'label' => __( 'Last name', 'woocommerce' ),
+					'label' => __('Last name', 'woocommerce'),
 					'show'  => false,
 				),
 				'company'    => array(
-					'label' => __( 'Company', 'woocommerce' ),
+					'label' => __('Company', 'woocommerce'),
 					'show'  => false,
 				),
 				'address_1'  => array(
-					'label' => __( 'Address line 1', 'woocommerce' ),
+					'label' => __('Address line 1', 'woocommerce'),
 					'show'  => false,
 				),
 				'address_2'  => array(
-					'label' => __( 'Address line 2', 'woocommerce' ),
+					'label' => __('Address line 2', 'woocommerce'),
 					'show'  => false,
 				),
 				'city'       => array(
-					'label' => __( 'City', 'woocommerce' ),
+					'label' => __('City', 'woocommerce'),
 					'show'  => false,
 				),
 				'postcode'   => array(
-					'label' => __( 'Postcode / ZIP', 'woocommerce' ),
+					'label' => __('Postcode / ZIP', 'woocommerce'),
 					'show'  => false,
 				),
 				'country'    => array(
-					'label'   => __( 'Country / Region', 'woocommerce' ),
+					'label'   => __('Country / Region', 'woocommerce'),
 					'show'    => false,
 					'type'    => 'select',
 					'class'   => 'js_field-country select short',
-					'options' => array( '' => __( 'Select a country / region…', 'woocommerce' ) ) + WC()->countries->get_shipping_countries(),
+					'options' => array('' => __('Select a country / region…', 'woocommerce')) + WC()->countries->get_shipping_countries(),
 				),
 				'state'      => array(
-					'label' => __( 'State / County', 'woocommerce' ),
+					'label' => __('State / County', 'woocommerce'),
 					'class' => 'js_field-state select short',
 					'show'  => false,
 				),
 				'phone'      => array(
-					'label' => __( 'Phone', 'woocommerce' ),
+					'label' => __('Phone', 'woocommerce'),
 				),
 			)
 		);
@@ -145,18 +145,18 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 		global $theorder;
 
-		if ( ! is_object( $theorder ) ) {
-			$theorder = wc_get_order( $post->ID );
+		if (!is_object($theorder)) {
+			$theorder = wc_get_order($post->ID);
 		}
 
 		$order = $theorder;
 
 		self::init_address_fields();
 
-		if ( WC()->payment_gateways() ) {
+		if (WC()->payment_gateways()) {
 			$payment_gateways = WC()->payment_gateways->payment_gateways();
 		} else {
 			$payment_gateways = array();
@@ -164,24 +164,24 @@ 
 
 		$payment_method = $order->get_payment_method();
 
-		$order_type_object = get_post_type_object( $post->post_type );
-		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+		$order_type_object = get_post_type_object($post->post_type);
+		wp_nonce_field('woocommerce_save_data', 'woocommerce_meta_nonce');
 		?>
 		<style type="text/css">
 			#post-body-content, #titlediv { display:none }
 		</style>
 		<div class="panel-wrap woocommerce">
-			<input name="post_title" type="hidden" value="<?php echo empty( $post->post_title ) ? __( 'Order', 'woocommerce' ) : esc_attr( $post->post_title ); ?>" />
-			<input name="post_status" type="hidden" value="<?php echo esc_attr( $post->post_status ); ?>" />
+			<input name="post_title" type="hidden" value="<?php echo empty($post->post_title) ? __('Order', 'woocommerce') : esc_attr($post->post_title); ?>" />
+			<input name="post_status" type="hidden" value="<?php echo esc_attr($post->post_status); ?>" />
 			<div id="order_data" class="panel woocommerce-order-data">
 				<h2 class="woocommerce-order-data__heading">
 					<?php
 
 					/* translators: 1: order type 2: order number */
 					printf(
-						esc_html__( '%1$s #%2$s details', 'woocommerce' ),
-						esc_html( $order_type_object->labels->singular_name ),
-						esc_html( $order->get_order_number() )
+						esc_html__('%1$s #%2$s details', 'woocommerce'),
+						esc_html($order_type_object->labels->singular_name),
+						esc_html($order->get_order_number())
 					);
 
 					?>
@@ -191,67 +191,67 @@ 
 
 					$meta_list = array();
 
-					if ( $payment_method && 'other' !== $payment_method ) {
+					if ($payment_method && 'other' !== $payment_method) {
 						/* translators: %s: payment method */
 						$payment_method_string = sprintf(
-							__( 'Payment via %s', 'woocommerce' ),
-							esc_html( isset( $payment_gateways[ $payment_method ] ) ? $payment_gateways[ $payment_method ]->get_title() : $payment_method )
+							__('Payment via %s', 'woocommerce'),
+							esc_html(isset($payment_gateways[$payment_method]) ? $payment_gateways[$payment_method]->get_title() : $payment_method)
 						);
 
-						if ( $transaction_id = $order->get_transaction_id() ) {
-							if ( isset( $payment_gateways[ $payment_method ] ) && ( $url = $payment_gateways[ $payment_method ]->get_transaction_url( $order ) ) ) {
-								$payment_method_string .= ' (<a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $transaction_id ) . '</a>)';
+						if ($transaction_id = $order->get_transaction_id()) {
+							if (isset($payment_gateways[$payment_method]) && ($url = $payment_gateways[$payment_method]->get_transaction_url($order))) {
+								$payment_method_string .= ' (<a href="' . esc_url($url) . '" target="_blank">' . esc_html($transaction_id) . '</a>)';
 							} else {
-								$payment_method_string .= ' (' . esc_html( $transaction_id ) . ')';
+								$payment_method_string .= ' (' . esc_html($transaction_id) . ')';
 							}
 						}
 
 						$meta_list[] = $payment_method_string;
 					}
 
-					if ( $order->get_date_paid() ) {
+					if ($order->get_date_paid()) {
 						/* translators: 1: date 2: time */
 						$meta_list[] = sprintf(
-							__( 'Paid on %1$s @ %2$s', 'woocommerce' ),
-							wc_format_datetime( $order->get_date_paid() ),
-							wc_format_datetime( $order->get_date_paid(), get_option( 'time_format' ) )
+							__('Paid on %1$s @ %2$s', 'woocommerce'),
+							wc_format_datetime($order->get_date_paid()),
+							wc_format_datetime($order->get_date_paid(), get_option('time_format'))
 						);
 					}
 
-					if ( $ip_address = $order->get_customer_ip_address() ) {
+					if ($ip_address = $order->get_customer_ip_address()) {
 						/* translators: %s: IP address */
 						$meta_list[] = sprintf(
-							__( 'Customer IP: %s', 'woocommerce' ),
-							'<span class="woocommerce-Order-customerIP">' . esc_html( $ip_address ) . '</span>'
+							__('Customer IP: %s', 'woocommerce'),
+							'<span class="woocommerce-Order-customerIP">' . esc_html($ip_address) . '</span>'
 						);
 					}
 
-					echo wp_kses_post( implode( '. ', $meta_list ) );
+					echo wp_kses_post(implode('. ', $meta_list));
 
 					?>
 				</p>
 				<div class="order_data_column_container">
 					<div class="order_data_column">
-						<h3><?php esc_html_e( 'General', 'woocommerce' ); ?></h3>
+						<h3><?php esc_html_e('General', 'woocommerce'); ?></h3>
 
 						<p class="form-field form-field-wide">
-							<label for="order_date"><?php _e( 'Date created:', 'woocommerce' ); ?></label>
-							<input type="text" class="date-picker" name="order_date" maxlength="10" value="<?php echo esc_attr( date_i18n( 'Y-m-d', strtotime( $post->post_date ) ) ); ?>" pattern="<?php echo esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ); ?>" />@
+							<label for="order_date"><?php _e('Date created:', 'woocommerce'); ?></label>
+							<input type="text" class="date-picker" name="order_date" maxlength="10" value="<?php echo esc_attr(date_i18n('Y-m-d', strtotime($post->post_date))); ?>" pattern="<?php echo esc_attr(apply_filters('woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])')); ?>" />@
 							&lrm;
-							<input type="number" class="hour" placeholder="<?php esc_attr_e( 'h', 'woocommerce' ); ?>" name="order_date_hour" min="0" max="23" step="1" value="<?php echo esc_attr( date_i18n( 'H', strtotime( $post->post_date ) ) ); ?>" pattern="([01]?[0-9]{1}|2[0-3]{1})" />:
-							<input type="number" class="minute" placeholder="<?php esc_attr_e( 'm', 'woocommerce' ); ?>" name="order_date_minute" min="0" max="59" step="1" value="<?php echo esc_attr( date_i18n( 'i', strtotime( $post->post_date ) ) ); ?>" pattern="[0-5]{1}[0-9]{1}" />
-							<input type="hidden" name="order_date_second" value="<?php echo esc_attr( date_i18n( 's', strtotime( $post->post_date ) ) ); ?>" />
+							<input type="number" class="hour" placeholder="<?php esc_attr_e('h', 'woocommerce'); ?>" name="order_date_hour" min="0" max="23" step="1" value="<?php echo esc_attr(date_i18n('H', strtotime($post->post_date))); ?>" pattern="([01]?[0-9]{1}|2[0-3]{1})" />:
+							<input type="number" class="minute" placeholder="<?php esc_attr_e('m', 'woocommerce'); ?>" name="order_date_minute" min="0" max="59" step="1" value="<?php echo esc_attr(date_i18n('i', strtotime($post->post_date))); ?>" pattern="[0-5]{1}[0-9]{1}" />
+							<input type="hidden" name="order_date_second" value="<?php echo esc_attr(date_i18n('s', strtotime($post->post_date))); ?>" />
 						</p>
 
 						<p class="form-field form-field-wide wc-order-status">
 							<label for="order_status">
 								<?php
-								_e( 'Status:', 'woocommerce' );
-								if ( $order->needs_payment() ) {
+								_e('Status:', 'woocommerce');
+								if ($order->needs_payment()) {
 									printf(
 										'<a href="%s">%s</a>',
-										esc_url( $order->get_checkout_payment_url() ),
-										__( 'Customer payment page &rarr;', 'woocommerce' )
+										esc_url($order->get_checkout_payment_url()),
+										__('Customer payment page &rarr;', 'woocommerce')
 									);
 								}
 								?>
@@ -259,8 +259,8 @@ 
 							<select id="order_status" name="order_status" class="wc-enhanced-select">
 								<?php
 								$statuses = wc_get_order_statuses();
-								foreach ( $statuses as $status => $status_name ) {
-									echo '<option value="' . esc_attr( $status ) . '" ' . selected( $status, 'wc-' . $order->get_status( 'edit' ), false ) . '>' . esc_html( $status_name ) . '</option>';
+								foreach ($statuses as $status => $status_name) {
+									echo '<option value="' . esc_attr($status) . '" ' . selected($status, 'wc-' . $order->get_status('edit'), false) . '>' . esc_html($status_name) . '</option>';
 								}
 								?>
 							</select>
@@ -270,22 +270,22 @@ 
 							<!--email_off--> <!-- Disable CloudFlare email obfuscation -->
 							<label for="customer_user">
 								<?php
-								_e( 'Customer:', 'woocommerce' );
-								if ( $order->get_user_id( 'edit' ) ) {
+								_e('Customer:', 'woocommerce');
+								if ($order->get_user_id('edit')) {
 									$args = array(
 										'post_status'    => 'all',
 										'post_type'      => 'shop_order',
-										'_customer_user' => $order->get_user_id( 'edit' ),
+										'_customer_user' => $order->get_user_id('edit'),
 									);
 									printf(
 										'<a href="%s">%s</a>',
-										esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ),
-										' ' . __( 'View other orders &rarr;', 'woocommerce' )
+										esc_url(add_query_arg($args, admin_url('edit.php'))),
+										' ' . __('View other orders &rarr;', 'woocommerce')
 									);
 									printf(
 										'<a href="%s">%s</a>',
-										esc_url( add_query_arg( 'user_id', $order->get_user_id( 'edit' ), admin_url( 'user-edit.php' ) ) ),
-										' ' . __( 'Profile &rarr;', 'woocommerce' )
+										esc_url(add_query_arg('user_id', $order->get_user_id('edit'), admin_url('user-edit.php'))),
+										' ' . __('Profile &rarr;', 'woocommerce')
 									);
 								}
 								?>
@@ -293,68 +293,68 @@ 
 							<?php
 							$user_string = '';
 							$user_id     = '';
-							if ( $order->get_user_id() ) {
-								$user_id = absint( $order->get_user_id() );
-								$user    = get_user_by( 'id', $user_id );
+							if ($order->get_user_id()) {
+								$user_id = absint($order->get_user_id());
+								$user    = get_user_by('id', $user_id);
 								/* translators: 1: user display name 2: user ID 3: user email */
 								$user_string = sprintf(
-									esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
+									esc_html__('%1$s (#%2$s &ndash; %3$s)', 'woocommerce'),
 									$user->display_name,
-									absint( $user->ID ),
+									absint($user->ID),
 									$user->user_email
 								);
 							}
 							?>
-							<select class="wc-customer-search" id="customer_user" name="customer_user" data-placeholder="<?php esc_attr_e( 'Guest', 'woocommerce' ); ?>" data-allow_clear="true">
-								<option value="<?php echo esc_attr( $user_id ); ?>" selected="selected"><?php echo htmlspecialchars( wp_kses_post( $user_string ) ); // htmlspecialchars to prevent XSS when rendered by selectWoo. ?></option>
+							<select class="wc-customer-search" id="customer_user" name="customer_user" data-placeholder="<?php esc_attr_e('Guest', 'woocommerce'); ?>" data-allow_clear="true">
+								<option value="<?php echo esc_attr($user_id); ?>" selected="selected"><?php echo htmlspecialchars(wp_kses_post($user_string)); // htmlspecialchars to prevent XSS when rendered by selectWoo. ?></option>
 							</select>
 							<!--/email_off-->
 						</p>
-						<?php do_action( 'woocommerce_admin_order_data_after_order_details', $order ); ?>
+						<?php do_action('woocommerce_admin_order_data_after_order_details', $order); ?>
 					</div>
 					<div class="order_data_column">
 						<h3>
-							<?php esc_html_e( 'Billing', 'woocommerce' ); ?>
-							<a href="#" class="edit_address"><?php esc_html_e( 'Edit', 'woocommerce' ); ?></a>
+							<?php esc_html_e('Billing', 'woocommerce'); ?>
+							<a href="#" class="edit_address"><?php esc_html_e('Edit', 'woocommerce'); ?></a>
 							<span>
-								<a href="#" class="load_customer_billing" style="display:none;"><?php esc_html_e( 'Load billing address', 'woocommerce' ); ?></a>
+								<a href="#" class="load_customer_billing" style="display:none;"><?php esc_html_e('Load billing address', 'woocommerce'); ?></a>
 							</span>
 						</h3>
 						<div class="address">
 							<?php
 
 							// Display values.
-							if ( $order->get_formatted_billing_address() ) {
-								echo '<p>' . wp_kses( $order->get_formatted_billing_address(), array( 'br' => array() ) ) . '</p>';
+							if ($order->get_formatted_billing_address()) {
+								echo '<p>' . wp_kses($order->get_formatted_billing_address(), array('br' => array())) . '</p>';
 							} else {
-								echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No billing address set.', 'woocommerce' ) . '</p>';
+								echo '<p class="none_set"><strong>' . __('Address:', 'woocommerce') . '</strong> ' . __('No billing address set.', 'woocommerce') . '</p>';
 							}
 
-							foreach ( self::$billing_fields as $key => $field ) {
-								if ( isset( $field['show'] ) && false === $field['show'] ) {
+							foreach (self::$billing_fields as $key => $field) {
+								if (isset($field['show']) && false === $field['show']) {
 									continue;
 								}
 
 								$field_name = 'billing_' . $key;
 
-								if ( isset( $field['value'] ) ) {
+								if (isset($field['value'])) {
 									$field_value = $field['value'];
-								} elseif ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-									$field_value = $order->{"get_$field_name"}( 'edit' );
+								} elseif (is_callable(array($order, 'get_' . $field_name))) {
+									$field_value = $order->{"get_$field_name"}('edit');
 								} else {
-									$field_value = $order->get_meta( '_' . $field_name );
+									$field_value = $order->get_meta('_' . $field_name);
 								}
 
-								if ( 'billing_phone' === $field_name ) {
-									$field_value = wc_make_phone_clickable( $field_value );
-								} elseif ( 'billing_email' === $field_name ) {
-									$field_value = '<a href="' . esc_url( 'mailto:' . $field_value ) . '">' . $field_value . '</a>';
+								if ('billing_phone' === $field_name) {
+									$field_value = wc_make_phone_clickable($field_value);
+								} elseif ('billing_email' === $field_name) {
+									$field_value = '<a href="' . esc_url('mailto:' . $field_value) . '">' . $field_value . '</a>';
 								} else {
-									$field_value = make_clickable( esc_html( $field_value ) );
+									$field_value = make_clickable(esc_html($field_value));
 								}
 
-								if ( $field_value ) {
-									echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . wp_kses_post( $field_value ) . '</p>';
+								if ($field_value) {
+									echo '<p><strong>' . esc_html($field['label']) . ':</strong> ' . wp_kses_post($field_value) . '</p>';
 								}
 							}
 							?>
@@ -364,54 +364,54 @@ 
 							<?php
 
 							// Display form.
-							foreach ( self::$billing_fields as $key => $field ) {
-								if ( ! isset( $field['type'] ) ) {
+							foreach (self::$billing_fields as $key => $field) {
+								if (!isset($field['type'])) {
 									$field['type'] = 'text';
 								}
-								if ( ! isset( $field['id'] ) ) {
+								if (!isset($field['id'])) {
 									$field['id'] = '_billing_' . $key;
 								}
 
 								$field_name = 'billing_' . $key;
 
-								if ( ! isset( $field['value'] ) ) {
-									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-										$field['value'] = $order->{"get_$field_name"}( 'edit' );
+								if (!isset($field['value'])) {
+									if (is_callable(array($order, 'get_' . $field_name))) {
+										$field['value'] = $order->{"get_$field_name"}('edit');
 									} else {
-										$field['value'] = $order->get_meta( '_' . $field_name );
+										$field['value'] = $order->get_meta('_' . $field_name);
 									}
 								}
 
-								switch ( $field['type'] ) {
+								switch ($field['type']) {
 									case 'select':
-										woocommerce_wp_select( $field );
+										woocommerce_wp_select($field);
 										break;
 									default:
-										woocommerce_wp_text_input( $field );
+										woocommerce_wp_text_input($field);
 										break;
 								}
 							}
 							?>
 							<p class="form-field form-field-wide">
-								<label><?php esc_html_e( 'Payment method:', 'woocommerce' ); ?></label>
+								<label><?php esc_html_e('Payment method:', 'woocommerce'); ?></label>
 								<select name="_payment_method" id="_payment_method" class="first">
-									<option value=""><?php esc_html_e( 'N/A', 'woocommerce' ); ?></option>
+									<option value=""><?php esc_html_e('N/A', 'woocommerce'); ?></option>
 									<?php
 									$found_method = false;
 
-									foreach ( $payment_gateways as $gateway ) {
-										if ( 'yes' === $gateway->enabled ) {
-											echo '<option value="' . esc_attr( $gateway->id ) . '" ' . selected( $payment_method, $gateway->id, false ) . '>' . esc_html( $gateway->get_title() ) . '</option>';
-											if ( $payment_method == $gateway->id ) {
+									foreach ($payment_gateways as $gateway) {
+										if ('yes' === $gateway->enabled) {
+											echo '<option value="' . esc_attr($gateway->id) . '" ' . selected($payment_method, $gateway->id, false) . '>' . esc_html($gateway->get_title()) . '</option>';
+											if ($payment_method == $gateway->id) {
 												$found_method = true;
 											}
 										}
 									}
 
-									if ( ! $found_method && ! empty( $payment_method ) ) {
-										echo '<option value="' . esc_attr( $payment_method ) . '" selected="selected">' . esc_html__( 'Other', 'woocommerce' ) . '</option>';
+									if (!$found_method && !empty($payment_method)) {
+										echo '<option value="' . esc_attr($payment_method) . '" selected="selected">' . esc_html__('Other', 'woocommerce') . '</option>';
 									} else {
-										echo '<option value="other">' . esc_html__( 'Other', 'woocommerce' ) . '</option>';
+										echo '<option value="other">' . esc_html__('Other', 'woocommerce') . '</option>';
 									}
 									?>
 								</select>
@@ -421,60 +421,60 @@ 
 							woocommerce_wp_text_input(
 								array(
 									'id'    => '_transaction_id',
-									'label' => __( 'Transaction ID', 'woocommerce' ),
-									'value' => $order->get_transaction_id( 'edit' ),
+									'label' => __('Transaction ID', 'woocommerce'),
+									'value' => $order->get_transaction_id('edit'),
 								)
 							);
 							?>
 
 						</div>
-						<?php do_action( 'woocommerce_admin_order_data_after_billing_address', $order ); ?>
+						<?php do_action('woocommerce_admin_order_data_after_billing_address', $order); ?>
 					</div>
 					<div class="order_data_column">
 						<h3>
-							<?php esc_html_e( 'Shipping', 'woocommerce' ); ?>
-							<a href="#" class="edit_address"><?php esc_html_e( 'Edit', 'woocommerce' ); ?></a>
+							<?php esc_html_e('Shipping', 'woocommerce'); ?>
+							<a href="#" class="edit_address"><?php esc_html_e('Edit', 'woocommerce'); ?></a>
 							<span>
-								<a href="#" class="load_customer_shipping" style="display:none;"><?php esc_html_e( 'Load shipping address', 'woocommerce' ); ?></a>
-								<a href="#" class="billing-same-as-shipping" style="display:none;"><?php esc_html_e( 'Copy billing address', 'woocommerce' ); ?></a>
+								<a href="#" class="load_customer_shipping" style="display:none;"><?php esc_html_e('Load shipping address', 'woocommerce'); ?></a>
+								<a href="#" class="billing-same-as-shipping" style="display:none;"><?php esc_html_e('Copy billing address', 'woocommerce'); ?></a>
 							</span>
 						</h3>
 						<div class="address">
 							<?php
 
 							// Display values.
-							if ( $order->get_formatted_shipping_address() ) {
-								echo '<p>' . wp_kses( $order->get_formatted_shipping_address(), array( 'br' => array() ) ) . '</p>';
+							if ($order->get_formatted_shipping_address()) {
+								echo '<p>' . wp_kses($order->get_formatted_shipping_address(), array('br' => array())) . '</p>';
 							} else {
-								echo '<p class="none_set"><strong>' . __( 'Address:', 'woocommerce' ) . '</strong> ' . __( 'No shipping address set.', 'woocommerce' ) . '</p>';
+								echo '<p class="none_set"><strong>' . __('Address:', 'woocommerce') . '</strong> ' . __('No shipping address set.', 'woocommerce') . '</p>';
 							}
 
-							if ( ! empty( self::$shipping_fields ) ) {
-								foreach ( self::$shipping_fields as $key => $field ) {
-									if ( isset( $field['show'] ) && false === $field['show'] ) {
+							if (!empty(self::$shipping_fields)) {
+								foreach (self::$shipping_fields as $key => $field) {
+									if (isset($field['show']) && false === $field['show']) {
 										continue;
 									}
 
 									$field_name = 'shipping_' . $key;
 
-									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-										$field_value = $order->{"get_$field_name"}( 'edit' );
+									if (is_callable(array($order, 'get_' . $field_name))) {
+										$field_value = $order->{"get_$field_name"}('edit');
 									} else {
-										$field_value = $order->get_meta( '_' . $field_name );
+										$field_value = $order->get_meta('_' . $field_name);
 									}
 
-									if ( 'shipping_phone' === $field_name ) {
-										$field_value = wc_make_phone_clickable( $field_value );
+									if ('shipping_phone' === $field_name) {
+										$field_value = wc_make_phone_clickable($field_value);
 									}
 
-									if ( $field_value ) {
-										echo '<p><strong>' . esc_html( $field['label'] ) . ':</strong> ' . wp_kses_post( $field_value ) . '</p>';
+									if ($field_value) {
+										echo '<p><strong>' . esc_html($field['label']) . ':</strong> ' . wp_kses_post($field_value) . '</p>';
 									}
 								}
 							}
 
-							if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) && $post->post_excerpt ) {
-								echo '<p class="order_note"><strong>' . __( 'Customer provided note:', 'woocommerce' ) . '</strong> ' . nl2br( esc_html( $post->post_excerpt ) ) . '</p>';
+							if (apply_filters('woocommerce_enable_order_notes_field', 'yes' == get_option('woocommerce_enable_order_comments', 'yes')) && $post->post_excerpt) {
+								echo '<p class="order_note"><strong>' . __('Customer provided note:', 'woocommerce') . '</strong> ' . nl2br(esc_html($post->post_excerpt)) . '</p>';
 							}
 							?>
 						</div>
@@ -482,44 +482,44 @@ 
 							<?php
 
 							// Display form.
-							if ( ! empty( self::$shipping_fields ) ) {
-								foreach ( self::$shipping_fields as $key => $field ) {
-									if ( ! isset( $field['type'] ) ) {
+							if (!empty(self::$shipping_fields)) {
+								foreach (self::$shipping_fields as $key => $field) {
+									if (!isset($field['type'])) {
 										$field['type'] = 'text';
 									}
-									if ( ! isset( $field['id'] ) ) {
+									if (!isset($field['id'])) {
 										$field['id'] = '_shipping_' . $key;
 									}
 
 									$field_name = 'shipping_' . $key;
 
-									if ( is_callable( array( $order, 'get_' . $field_name ) ) ) {
-										$field['value'] = $order->{"get_$field_name"}( 'edit' );
+									if (is_callable(array($order, 'get_' . $field_name))) {
+										$field['value'] = $order->{"get_$field_name"}('edit');
 									} else {
-										$field['value'] = $order->get_meta( '_' . $field_name );
+										$field['value'] = $order->get_meta('_' . $field_name);
 									}
 
-									switch ( $field['type'] ) {
+									switch ($field['type']) {
 										case 'select':
-											woocommerce_wp_select( $field );
+											woocommerce_wp_select($field);
 											break;
 										default:
-											woocommerce_wp_text_input( $field );
+											woocommerce_wp_text_input($field);
 											break;
 									}
 								}
 							}
 
-							if ( apply_filters( 'woocommerce_enable_order_notes_field', 'yes' == get_option( 'woocommerce_enable_order_comments', 'yes' ) ) ) :
+							if (apply_filters('woocommerce_enable_order_notes_field', 'yes' == get_option('woocommerce_enable_order_comments', 'yes'))) :
 								?>
 								<p class="form-field form-field-wide">
-									<label for="excerpt"><?php _e( 'Customer provided note', 'woocommerce' ); ?>:</label>
-									<textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt" placeholder="<?php esc_attr_e( 'Customer notes about the order', 'woocommerce' ); ?>"><?php echo wp_kses_post( $post->post_excerpt ); ?></textarea>
+									<label for="excerpt"><?php _e('Customer provided note', 'woocommerce'); ?>:</label>
+									<textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt" placeholder="<?php esc_attr_e('Customer notes about the order', 'woocommerce'); ?>"><?php echo wp_kses_post($post->post_excerpt); ?></textarea>
 								</p>
 							<?php endif; ?>
 						</div>
 
-						<?php do_action( 'woocommerce_admin_order_data_after_shipping_address', $order ); ?>
+						<?php do_action('woocommerce_admin_order_data_after_shipping_address', $order); ?>
 					</div>
 				</div>
 				<div class="clear"></div>
@@ -533,7 +533,7 @@ 
 	 *
 	 * @param int $order_id Order ID.
 	 */
-	public static function save( $order_id ) {
+	public static function save($order_id) {
 		self::init_address_fields();
 
 		// Ensure gateways are loaded in case they need to insert data into the emails.
@@ -541,74 +541,74 @@ 
 		WC()->shipping();
 
 		// Get order object.
-		$order = wc_get_order( $order_id );
+		$order = wc_get_order($order_id);
 		$props = array();
 
 		// Create order key.
-		if ( ! $order->get_order_key() ) {
+		if (!$order->get_order_key()) {
 			$props['order_key'] = wc_generate_order_key();
 		}
 
 		// Update customer.
-		$customer_id = isset( $_POST['customer_user'] ) ? absint( $_POST['customer_user'] ) : 0;
-		if ( $customer_id !== $order->get_customer_id() ) {
+		$customer_id = isset($_POST['customer_user']) ? absint($_POST['customer_user']) : 0;
+		if ($customer_id !== $order->get_customer_id()) {
 			$props['customer_id'] = $customer_id;
 		}
 
 		// Update billing fields.
-		if ( ! empty( self::$billing_fields ) ) {
-			foreach ( self::$billing_fields as $key => $field ) {
-				if ( ! isset( $field['id'] ) ) {
+		if (!empty(self::$billing_fields)) {
+			foreach (self::$billing_fields as $key => $field) {
+				if (!isset($field['id'])) {
 					$field['id'] = '_billing_' . $key;
 				}
 
-				if ( ! isset( $_POST[ $field['id'] ] ) ) {
+				if (!isset($_POST[$field['id']])) {
 					continue;
 				}
 
-				if ( is_callable( array( $order, 'set_billing_' . $key ) ) ) {
-					$props[ 'billing_' . $key ] = wc_clean( wp_unslash( $_POST[ $field['id'] ] ) );
+				if (is_callable(array($order, 'set_billing_' . $key))) {
+					$props['billing_' . $key] = wc_clean(wp_unslash($_POST[$field['id']]));
 				} else {
-					$order->update_meta_data( $field['id'], wc_clean( wp_unslash( $_POST[ $field['id'] ] ) ) );
+					$order->update_meta_data($field['id'], wc_clean(wp_unslash($_POST[$field['id']])));
 				}
 			}
 		}
 
 		// Update shipping fields.
-		if ( ! empty( self::$shipping_fields ) ) {
-			foreach ( self::$shipping_fields as $key => $field ) {
-				if ( ! isset( $field['id'] ) ) {
+		if (!empty(self::$shipping_fields)) {
+			foreach (self::$shipping_fields as $key => $field) {
+				if (!isset($field['id'])) {
 					$field['id'] = '_shipping_' . $key;
 				}
 
-				if ( ! isset( $_POST[ $field['id'] ] ) ) {
+				if (!isset($_POST[$field['id']])) {
 					continue;
 				}
 
-				if ( is_callable( array( $order, 'set_shipping_' . $key ) ) ) {
-					$props[ 'shipping_' . $key ] = wc_clean( wp_unslash( $_POST[ $field['id'] ] ) );
+				if (is_callable(array($order, 'set_shipping_' . $key))) {
+					$props['shipping_' . $key] = wc_clean(wp_unslash($_POST[$field['id']]));
 				} else {
-					$order->update_meta_data( $field['id'], wc_clean( wp_unslash( $_POST[ $field['id'] ] ) ) );
+					$order->update_meta_data($field['id'], wc_clean(wp_unslash($_POST[$field['id']])));
 				}
 			}
 		}
 
-		if ( isset( $_POST['_transaction_id'] ) ) {
-			$props['transaction_id'] = wc_clean( wp_unslash( $_POST['_transaction_id'] ) );
+		if (isset($_POST['_transaction_id'])) {
+			$props['transaction_id'] = wc_clean(wp_unslash($_POST['_transaction_id']));
 		}
 
 		// Payment method handling.
-		if ( $order->get_payment_method() !== wp_unslash( $_POST['_payment_method'] ) ) {
+		if ($order->get_payment_method() !== wp_unslash($_POST['_payment_method'])) {
 			$methods              = WC()->payment_gateways->payment_gateways();
-			$payment_method       = wc_clean( wp_unslash( $_POST['_payment_method'] ) );
+			$payment_method       = wc_clean(wp_unslash($_POST['_payment_method']));
 			$payment_method_title = $payment_method;
 
-			if ( isset( $methods ) && isset( $methods[ $payment_method ] ) ) {
-				$payment_method_title = $methods[ $payment_method ]->get_title();
+			if (isset($methods) && isset($methods[$payment_method])) {
+				$payment_method_title = $methods[$payment_method]->get_title();
 			}
 
-			if ( $payment_method == 'other') {
-				$payment_method_title = esc_html__( 'Other', 'woocommerce' );
+			if ($payment_method == 'other') {
+				$payment_method_title = esc_html__('Other', 'woocommerce');
 			}
 			
 			$props['payment_method']       = $payment_method;
@@ -616,22 +616,22 @@ 
 		}
 
 		// Update date.
-		if ( empty( $_POST['order_date'] ) ) {
+		if (empty($_POST['order_date'])) {
 			$date = time();
 		} else {
-			$date = gmdate( 'Y-m-d H:i:s', strtotime( $_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':' . (int) $_POST['order_date_second'] ) );
+			$date = gmdate('Y-m-d H:i:s', strtotime($_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':' . (int) $_POST['order_date_second']));
 		}
 
 		$props['date_created'] = $date;
 
 		// Set created via prop if new post.
-		if ( isset( $_POST['original_post_status'] ) && $_POST['original_post_status'] === 'auto-draft' ) {
+		if (isset($_POST['original_post_status']) && $_POST['original_post_status'] === 'auto-draft') {
 			$props['created_via'] = 'admin';
 		}
 
 		// Save order data.
-		$order->set_props( $props );
-		$order->set_status( wc_clean( wp_unslash( $_POST['order_status'] ) ), '', true );
+		$order->set_props($props);
+		$order->set_status(wc_clean(wp_unslash($_POST['order_status'])), '', true);
 		$order->save();
 	}
 }

plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-reviews.php

Indentation +39 added lines, -39 removed lines

@@ -14,47 +14,47 @@
  */
 class WC_Meta_Box_Product_Reviews {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param object $comment Comment being shown.
-	 */
-	public static function output( $comment ) {
-		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
-
-		$current = get_comment_meta( $comment->comment_ID, 'rating', true );
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param object $comment Comment being shown.
+     */
+    public static function output( $comment ) {
+        wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+
+        $current = get_comment_meta( $comment->comment_ID, 'rating', true );
+        ?>
 		<select name="rating" id="rating">
 			<?php
-			for ( $rating = 1; $rating <= 5; $rating ++ ) {
-				printf( '<option value="%1$s"%2$s>%1$s</option>', $rating, selected( $current, $rating, false ) ); // WPCS: XSS ok.
-			}
-			?>
+            for ( $rating = 1; $rating <= 5; $rating ++ ) {
+                printf( '<option value="%1$s"%2$s>%1$s</option>', $rating, selected( $current, $rating, false ) ); // WPCS: XSS ok.
+            }
+            ?>
 		</select>
 		<?php
-	}
-
-	/**
-	 * Save meta box data
-	 *
-	 * @param mixed $data Data to save.
-	 * @return mixed
-	 */
-	public static function save( $data ) {
-		// Not allowed, return regular value without updating meta.
-		if ( ! isset( $_POST['woocommerce_meta_nonce'], $_POST['rating'] ) || ! wp_verify_nonce( wp_unslash( $_POST['woocommerce_meta_nonce'] ), 'woocommerce_save_data' ) ) { // WPCS: input var ok, sanitization ok.
-			return $data;
-		}
-
-		if ( $_POST['rating'] > 5 || $_POST['rating'] < 0 ) { // WPCS: input var ok.
-			return $data;
-		}
-
-		$comment_id = $data['comment_ID'];
-
-		update_comment_meta( $comment_id, 'rating', intval( wp_unslash( $_POST['rating'] ) ) ); // WPCS: input var ok.
-
-		// Return regular value after updating.
-		return $data;
-	}
+    }
+
+    /**
+     * Save meta box data
+     *
+     * @param mixed $data Data to save.
+     * @return mixed
+     */
+    public static function save( $data ) {
+        // Not allowed, return regular value without updating meta.
+        if ( ! isset( $_POST['woocommerce_meta_nonce'], $_POST['rating'] ) || ! wp_verify_nonce( wp_unslash( $_POST['woocommerce_meta_nonce'] ), 'woocommerce_save_data' ) ) { // WPCS: input var ok, sanitization ok.
+            return $data;
+        }
+
+        if ( $_POST['rating'] > 5 || $_POST['rating'] < 0 ) { // WPCS: input var ok.
+            return $data;
+        }
+
+        $comment_id = $data['comment_ID'];
+
+        update_comment_meta( $comment_id, 'rating', intval( wp_unslash( $_POST['rating'] ) ) ); // WPCS: input var ok.
+
+        // Return regular value after updating.
+        return $data;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -7,7 +7,7 @@ 
  * @package WooCommerce\Admin\Meta Boxes
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Meta_Box_Product_Reviews
@@ -19,15 +19,15 @@ 
 	 *
 	 * @param object $comment Comment being shown.
 	 */
-	public static function output( $comment ) {
-		wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' );
+	public static function output($comment) {
+		wp_nonce_field('woocommerce_save_data', 'woocommerce_meta_nonce');
 
-		$current = get_comment_meta( $comment->comment_ID, 'rating', true );
+		$current = get_comment_meta($comment->comment_ID, 'rating', true);
 		?>
 		<select name="rating" id="rating">
 			<?php
-			for ( $rating = 1; $rating <= 5; $rating ++ ) {
-				printf( '<option value="%1$s"%2$s>%1$s</option>', $rating, selected( $current, $rating, false ) ); // WPCS: XSS ok.
+			for ($rating = 1; $rating <= 5; $rating++) {
+				printf('<option value="%1$s"%2$s>%1$s</option>', $rating, selected($current, $rating, false)); // WPCS: XSS ok.
 			}
 			?>
 		</select>
@@ -40,19 +40,19 @@ 
 	 * @param mixed $data Data to save.
 	 * @return mixed
 	 */
-	public static function save( $data ) {
+	public static function save($data) {
 		// Not allowed, return regular value without updating meta.
-		if ( ! isset( $_POST['woocommerce_meta_nonce'], $_POST['rating'] ) || ! wp_verify_nonce( wp_unslash( $_POST['woocommerce_meta_nonce'] ), 'woocommerce_save_data' ) ) { // WPCS: input var ok, sanitization ok.
+		if (!isset($_POST['woocommerce_meta_nonce'], $_POST['rating']) || !wp_verify_nonce(wp_unslash($_POST['woocommerce_meta_nonce']), 'woocommerce_save_data')) { // WPCS: input var ok, sanitization ok.
 			return $data;
 		}
 
-		if ( $_POST['rating'] > 5 || $_POST['rating'] < 0 ) { // WPCS: input var ok.
+		if ($_POST['rating'] > 5 || $_POST['rating'] < 0) { // WPCS: input var ok.
 			return $data;
 		}
 
 		$comment_id = $data['comment_ID'];
 
-		update_comment_meta( $comment_id, 'rating', intval( wp_unslash( $_POST['rating'] ) ) ); // WPCS: input var ok.
+		update_comment_meta($comment_id, 'rating', intval(wp_unslash($_POST['rating']))); // WPCS: input var ok.
 
 		// Return regular value after updating.
 		return $data;

plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php

Indentation +61 added lines, -61 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -17,52 +17,52 @@ 
  */
 class WC_Meta_Box_Order_Downloads {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
+        ?>
 		<div class="order_download_permissions wc-metaboxes-wrapper">
 
 			<div class="wc-metaboxes">
 				<?php
-				$data_store           = WC_Data_Store::load( 'customer-download' );
-				$download_permissions = $data_store->get_downloads(
-					array(
-						'order_id' => $post->ID,
-						'orderby'  => 'product_id',
-					)
-				);
+                $data_store           = WC_Data_Store::load( 'customer-download' );
+                $download_permissions = $data_store->get_downloads(
+                    array(
+                        'order_id' => $post->ID,
+                        'orderby'  => 'product_id',
+                    )
+                );
 
-				$product      = null;
-				$loop         = 0;
-				$file_counter = 1;
+                $product      = null;
+                $loop         = 0;
+                $file_counter = 1;
 
-				if ( $download_permissions && sizeof( $download_permissions ) > 0 ) {
-					foreach ( $download_permissions as $download ) {
-						if ( ! $product || $product->get_id() !== $download->get_product_id() ) {
-							$product      = wc_get_product( $download->get_product_id() );
-							$file_counter = 1;
-						}
+                if ( $download_permissions && sizeof( $download_permissions ) > 0 ) {
+                    foreach ( $download_permissions as $download ) {
+                        if ( ! $product || $product->get_id() !== $download->get_product_id() ) {
+                            $product      = wc_get_product( $download->get_product_id() );
+                            $file_counter = 1;
+                        }
 
-						// don't show permissions to files that have since been removed.
-						if ( ! $product || ! $product->exists() || ! $product->has_file( $download->get_download_id() ) ) {
-							continue;
-						}
+                        // don't show permissions to files that have since been removed.
+                        if ( ! $product || ! $product->exists() || ! $product->has_file( $download->get_download_id() ) ) {
+                            continue;
+                        }
 
-						// Show file title instead of count if set.
-						$file       = $product->get_file( $download->get_download_id() );
-						$file_count = isset( $file['name'] ) ? $file['name'] : sprintf( __( 'File %d', 'woocommerce' ), $file_counter );
+                        // Show file title instead of count if set.
+                        $file       = $product->get_file( $download->get_download_id() );
+                        $file_count = isset( $file['name'] ) ? $file['name'] : sprintf( __( 'File %d', 'woocommerce' ), $file_counter );
 
-						include __DIR__ . '/views/html-order-download-permission.php';
+                        include __DIR__ . '/views/html-order-download-permission.php';
 
-						$loop++;
-						$file_counter++;
-					}
-				}
-				?>
+                        $loop++;
+                        $file_counter++;
+                    }
+                }
+                ?>
 			</div>
 
 			<div class="toolbar">
@@ -77,30 +77,30 @@ 
 
 		</div>
 		<?php
-	}
+    }
 
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int     $post_id
-	 * @param WP_Post $post
-	 */
-	public static function save( $post_id, $post ) {
-		if ( isset( $_POST['permission_id'] ) ) {
-			$permission_ids      = $_POST['permission_id'];
-			$downloads_remaining = $_POST['downloads_remaining'];
-			$access_expires      = $_POST['access_expires'];
-			$max                 = max( array_keys( $permission_ids ) );
+    /**
+     * Save meta box data.
+     *
+     * @param int     $post_id
+     * @param WP_Post $post
+     */
+    public static function save( $post_id, $post ) {
+        if ( isset( $_POST['permission_id'] ) ) {
+            $permission_ids      = $_POST['permission_id'];
+            $downloads_remaining = $_POST['downloads_remaining'];
+            $access_expires      = $_POST['access_expires'];
+            $max                 = max( array_keys( $permission_ids ) );
 
-			for ( $i = 0; $i <= $max; $i ++ ) {
-				if ( ! isset( $permission_ids[ $i ] ) ) {
-					continue;
-				}
-				$download = new WC_Customer_Download( $permission_ids[ $i ] );
-				$download->set_downloads_remaining( wc_clean( $downloads_remaining[ $i ] ) );
-				$download->set_access_expires( array_key_exists( $i, $access_expires ) && '' !== $access_expires[ $i ] ? strtotime( $access_expires[ $i ] ) : '' );
-				$download->save();
-			}
-		}
-	}
+            for ( $i = 0; $i <= $max; $i ++ ) {
+                if ( ! isset( $permission_ids[ $i ] ) ) {
+                    continue;
+                }
+                $download = new WC_Customer_Download( $permission_ids[ $i ] );
+                $download->set_downloads_remaining( wc_clean( $downloads_remaining[ $i ] ) );
+                $download->set_access_expires( array_key_exists( $i, $access_expires ) && '' !== $access_expires[ $i ] ? strtotime( $access_expires[ $i ] ) : '' );
+                $download->save();
+            }
+        }
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -22,13 +22,13 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 		?>
 		<div class="order_download_permissions wc-metaboxes-wrapper">
 
 			<div class="wc-metaboxes">
 				<?php
-				$data_store           = WC_Data_Store::load( 'customer-download' );
+				$data_store           = WC_Data_Store::load('customer-download');
 				$download_permissions = $data_store->get_downloads(
 					array(
 						'order_id' => $post->ID,
@@ -40,21 +40,21 @@ 
 				$loop         = 0;
 				$file_counter = 1;
 
-				if ( $download_permissions && sizeof( $download_permissions ) > 0 ) {
-					foreach ( $download_permissions as $download ) {
-						if ( ! $product || $product->get_id() !== $download->get_product_id() ) {
-							$product      = wc_get_product( $download->get_product_id() );
+				if ($download_permissions && sizeof($download_permissions) > 0) {
+					foreach ($download_permissions as $download) {
+						if (!$product || $product->get_id() !== $download->get_product_id()) {
+							$product      = wc_get_product($download->get_product_id());
 							$file_counter = 1;
 						}
 
 						// don't show permissions to files that have since been removed.
-						if ( ! $product || ! $product->exists() || ! $product->has_file( $download->get_download_id() ) ) {
+						if (!$product || !$product->exists() || !$product->has_file($download->get_download_id())) {
 							continue;
 						}
 
 						// Show file title instead of count if set.
-						$file       = $product->get_file( $download->get_download_id() );
-						$file_count = isset( $file['name'] ) ? $file['name'] : sprintf( __( 'File %d', 'woocommerce' ), $file_counter );
+						$file       = $product->get_file($download->get_download_id());
+						$file_count = isset($file['name']) ? $file['name'] : sprintf(__('File %d', 'woocommerce'), $file_counter);
 
 						include __DIR__ . '/views/html-order-download-permission.php';
 
@@ -67,9 +67,9 @@ 
 
 			<div class="toolbar">
 				<p class="buttons">
-					<select id="grant_access_id" class="wc-product-search" name="grant_access_id[]" multiple="multiple" style="width: 400px;" data-placeholder="<?php esc_attr_e( 'Search for a downloadable product&hellip;', 'woocommerce' ); ?>" data-action="woocommerce_json_search_downloadable_products_and_variations"></select>
+					<select id="grant_access_id" class="wc-product-search" name="grant_access_id[]" multiple="multiple" style="width: 400px;" data-placeholder="<?php esc_attr_e('Search for a downloadable product&hellip;', 'woocommerce'); ?>" data-action="woocommerce_json_search_downloadable_products_and_variations"></select>
 					<button type="button" class="button grant_access">
-						<?php _e( 'Grant access', 'woocommerce' ); ?>
+						<?php _e('Grant access', 'woocommerce'); ?>
 					</button>
 				</p>
 				<div class="clear"></div>
@@ -85,20 +85,20 @@ 
 	 * @param int     $post_id
 	 * @param WP_Post $post
 	 */
-	public static function save( $post_id, $post ) {
-		if ( isset( $_POST['permission_id'] ) ) {
+	public static function save($post_id, $post) {
+		if (isset($_POST['permission_id'])) {
 			$permission_ids      = $_POST['permission_id'];
 			$downloads_remaining = $_POST['downloads_remaining'];
 			$access_expires      = $_POST['access_expires'];
-			$max                 = max( array_keys( $permission_ids ) );
+			$max                 = max(array_keys($permission_ids));
 
-			for ( $i = 0; $i <= $max; $i ++ ) {
-				if ( ! isset( $permission_ids[ $i ] ) ) {
+			for ($i = 0; $i <= $max; $i++) {
+				if (!isset($permission_ids[$i])) {
 					continue;
 				}
-				$download = new WC_Customer_Download( $permission_ids[ $i ] );
-				$download->set_downloads_remaining( wc_clean( $downloads_remaining[ $i ] ) );
-				$download->set_access_expires( array_key_exists( $i, $access_expires ) && '' !== $access_expires[ $i ] ? strtotime( $access_expires[ $i ] ) : '' );
+				$download = new WC_Customer_Download($permission_ids[$i]);
+				$download->set_downloads_remaining(wc_clean($downloads_remaining[$i]));
+				$download->set_access_expires(array_key_exists($i, $access_expires) && '' !== $access_expires[$i] ? strtotime($access_expires[$i]) : '');
 				$download->save();
 			}
 		}