From c21272505344793d67d559b73e9db9c730efe0c7 Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Tue, 30 May 2017 23:31:10 -0600 Subject: [PATCH] Use WC_Install class to install/activate WooCommerce services from the Extensions page. --- includes/admin/class-wc-admin-addons.php | 30 +++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 07cefc5d393..89e424cbef9 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -324,9 +324,11 @@ class WC_Admin_Addons { return; } - $button_url = $url = wp_nonce_url( - self_admin_url( 'update.php?action=install-plugin&plugin=woocommerce-services' ), - 'install-plugin_woocommerce-services' + $button_url = wp_nonce_url( + add_query_arg( array( + 'install-addon' => 'woocommerce-services', + ) ), + 'install-addon_woocommerce-services' ); $defaults = array( @@ -425,10 +427,32 @@ class WC_Admin_Addons { return; } + if ( isset( $_GET['install-addon'] ) && 'woocommerce-services' === $_GET['install-addon'] ) { + self::install_woocommerce_services_addon(); + } + $sections = self::get_sections(); $theme = wp_get_theme(); $section_keys = array_keys( $sections ); $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys ); 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; + } }