Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add/version-picking

This commit is contained in:
Peter Fabian 2018-06-06 23:19:25 +02:00
parent 68d1f3898f e0b4c2a1be
commit 3e75307f33
3 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-admin-menus.php
View File

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

46
plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-settings.php
View File

@ -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 ) {
?>
<label>
<input type="radio" id="<?php echo esc_attr( $args['label_for'] ); ?>" name="wc_beta_tester_options[<?php echo esc_attr( $args['label_for'] ); ?>]" value="<?php echo esc_attr( $channel_id ); ?>" <?php checked( $selected, $channel_id ); ?> />
<input type="radio" id="<?php echo esc_attr( $args['label_for'] ); ?>" name="wc_beta_tester_options[<?php echo esc_attr( $args['label_for'] ); ?>]" value="<?php echo esc_attr( $channel_id ); ?>" <?php checked( $settings->{ $args['label_for'] }, $channel_id ); ?> />
<?php echo esc_html( $channel['name'] ); ?>
<p class="description">
<?php echo esc_html( $channel['description'] ); ?>
@ -101,6 +104,21 @@ class WC_Beta_Tester_Settings {
echo '</fieldset>';
}
/**
* Auto updates checkbox markup output.
*
* @param array $args Arguments.
*/
public function automatic_update_checkbox_html( $args ) {
$settings = WC_Beta_Tester::get_settings();
?>
<label for="<?php echo esc_attr( $args['label_for'] ); ?>">
<input type="checkbox" id="<?php echo esc_attr( $args['label_for'] ); ?>" name="wc_beta_tester_options[<?php echo esc_attr( $args['label_for'] ); ?>]" value="1" <?php checked( $settings->{ $args['label_for'] }, true ); ?> />
<?php echo esc_html__( 'If enabled, WooCommerce will update to the latest release in the background. Use with caution; we do not recommend using this on production stores!', 'woocommerce-beta-tester' ); ?>
</label>
<?php
}
/**
* Add options page to menu
*/
@ -116,7 +134,7 @@ class WC_Beta_Tester_Settings {
return;
}
if ( isset( $_GET['settings-updated'] ) ) {
if ( isset( $_GET['settings-updated'] ) ) { // WPCS: input var.
add_settings_error( 'wc-beta-tester-messages', 'wc-beta-tester-message', __( 'Settings Saved', 'woocommerce-beta-tester' ), 'updated' );
}

35
plugins/woocommerce-beta-tester/includes/class-wc-beta-tester.php
View File

@ -43,6 +43,23 @@ class WC_Beta_Tester {
delete_site_transient( 'woocommerce_latest_tag' );
}
/**
* Get plugin settings.
*
* @return object
*/
public static function get_settings() {
$settings = (object) wp_parse_args(
get_option( 'wc_beta_tester_options', array() ),
array(
'channel' => 'stable',
'auto_update' => false,
)
);
$settings->auto_update = (bool) $settings->auto_update;
return $settings;
}
/**
* Get the plugin url.
*
@ -69,6 +86,7 @@ class WC_Beta_Tester {
add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'api_check' ) );
add_filter( 'plugins_api', array( $this, 'get_plugin_info' ), 10, 3 );
add_filter( 'upgrader_source_selection', array( $this, 'upgrader_source_selection' ), 10, 3 );
add_filter( 'auto_update_plugin', 'auto_update_woocommerce', 100, 2 );
$this->includes();
}
@ -326,10 +344,25 @@ class WC_Beta_Tester {
return $source;
}
/**
* Enable auto updates for WooCommerce.
*
* @param bool $update Should this autoupdate.
* @param object $plugin Plugin being checked.
* @return bool
*/
public function auto_update_woocommerce( $update, $plugin ) {
if ( true === $this->get_settings()->auto_update && 'woocommerce' === $item->slug ) {
return true;
} else {
return $update;
}
}
/**
* Gets release information from GitHub.
*
* @param string $version
* @param string $version Version number.
* @return bool|string False on error, description otherwise
*/
public function get_version_information( $version ) {