diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-admin-menus.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-admin-menus.php index e5b07f2788b..a9326bfde0b 100644 --- a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-admin-menus.php +++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-admin-menus.php @@ -138,20 +138,17 @@ class WC_Beta_Tester_Admin_Menus { 'title' => __( 'WC Beta Tester', 'woocommerce-beta-tester' ), ) ); - $current_channel = __( 'Stable', 'woocommerce-beta-tester' ); - $options = get_option( 'wc_beta_tester_options' ); - if ( isset( $options['wc-beta-tester-version'] ) ) { - switch ( $options['wc-beta-tester-version'] ) { - case 'beta': - $current_channel = __( 'Beta', 'woocommerce-beta-tester' ); - break; - case 'rc': - $current_channel = __( 'Release Candidate', 'woocommerce-beta-tester' ); - break; - default: - $current_channel = __( 'Stable', 'woocommerce-beta-tester' ); - break; - } + $settings = WC_Beta_Tester::get_settings(); + switch ( $settings->channel ) { + case 'beta': + $current_channel = __( 'Beta', 'woocommerce-beta-tester' ); + break; + case 'rc': + $current_channel = __( 'Release Candidate', 'woocommerce-beta-tester' ); + break; + default: + $current_channel = __( 'Stable', 'woocommerce-beta-tester' ); + break; } // TODO: Implementation of each node. diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-settings.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-settings.php index 0e3766b7b3d..7b76eb365fa 100644 --- a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-settings.php +++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-settings.php @@ -12,13 +12,6 @@ defined( 'ABSPATH' ) || exit; */ class WC_Beta_Tester_Settings { - /** - * Id for channel settings field. - * - * @var string - */ - public static $version_setting_id = 'wc-beta-tester-version'; - /** * Constructor */ @@ -41,13 +34,24 @@ class WC_Beta_Tester_Settings { ); add_settings_field( - self::$version_setting_id, + 'wc-beta-tester-version', __( 'Release Channel', 'woocommerce-beta-tester' ), array( $this, 'version_select_html' ), 'wc-beta-tester', 'wc-beta-tester-update', array( - 'label_for' => self::$version_setting_id, + 'label_for' => 'channel', + ) + ); + + add_settings_field( + 'wc-beta-tester-auto-update', + __( 'Automatic Updates', 'woocommerce-beta-tester' ), + array( $this, 'automatic_update_checkbox_html' ), + 'wc-beta-tester', + 'wc-beta-tester-update', + array( + 'label_for' => 'auto_update', ) ); } @@ -64,13 +68,12 @@ class WC_Beta_Tester_Settings { } /** - * Version select markup output + * Version select markup output. * * @param array $args Arguments. */ public function version_select_html( $args ) { - $options = get_option( 'wc_beta_tester_options' ); - $selected = isset( $options[ $args['label_for'] ] ) ? $options[ $args['label_for'] ] : 'stable'; + $settings = WC_Beta_Tester::get_settings(); $channels = array( 'beta' => array( 'name' => __( 'Beta Releases', 'woocommerce-beta-tester' ), @@ -89,7 +92,7 @@ class WC_Beta_Tester_Settings { foreach ( $channels as $channel_id => $channel ) { ?>