From c6d82f9c62c4f6de13de4c8bdcef794c676c393e Mon Sep 17 00:00:00 2001 From: md2017-ronak-ronakganatra1 Date: Mon, 11 Mar 2019 12:40:41 +0530 Subject: [PATCH] Task implemented of Namespace methods in wc-admin.php woocommerce/woocommerce-admin#1734. --- plugins/woocommerce-admin/lib/admin.php | 4 ++-- .../woocommerce-admin/lib/client-assets.php | 4 ++-- .../woocommerce-admin/woocommerce-admin.php | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/woocommerce-admin/lib/admin.php b/plugins/woocommerce-admin/lib/admin.php index 81b5001b173..e8813682ad3 100644 --- a/plugins/woocommerce-admin/lib/admin.php +++ b/plugins/woocommerce-admin/lib/admin.php @@ -381,7 +381,7 @@ function wc_admin_output_breadcrumb( $section ) { * * @todo Icon Placeholders for the ActivityPanel, when we implement the new designs. */ -function woocommerce_embed_page_header() { +function wc_admin_woocommerce_embed_page_header() { if ( ! wc_admin_is_embed_enabled_wc_page() ) { return; } @@ -406,7 +406,7 @@ function woocommerce_embed_page_header() { $value ) { $formatted_key = preg_replace( '/^wc-/', '', $key ); @@ -185,7 +185,7 @@ function wc_admin_print_script_settings() { 'embedBreadcrumbs' => wc_admin_get_embed_breadcrumbs(), 'siteLocale' => esc_attr( get_bloginfo( 'language' ) ), 'currency' => wc_admin_currency_settings(), - 'orderStatuses' => format_order_statuses( wc_get_order_statuses() ), + 'orderStatuses' => wc_admin_format_order_statuses( wc_get_order_statuses() ), 'stockStatuses' => wc_get_product_stock_status_options(), 'siteTitle' => get_bloginfo( 'name' ), 'dataEndpoints' => array(), diff --git a/plugins/woocommerce-admin/woocommerce-admin.php b/plugins/woocommerce-admin/woocommerce-admin.php index d77f89b8397..4da44f7a028 100755 --- a/plugins/woocommerce-admin/woocommerce-admin.php +++ b/plugins/woocommerce-admin/woocommerce-admin.php @@ -67,7 +67,7 @@ function wc_admin_build_notice() { * * @return bool */ -function dependencies_satisfied() { +function wc_admin_dependencies_satisfied() { $woocommerce_minimum_met = class_exists( 'WooCommerce' ) && version_compare( WC_VERSION, '3.5', '>' ); if ( ! $woocommerce_minimum_met ) { return false; @@ -89,16 +89,16 @@ function wc_admin_build_file_exists() { /** * Daily events to run. */ -function do_wc_admin_daily() { +function wc_admin_do_wc_admin_daily() { WC_Admin_Notes_New_Sales_Record::possibly_add_sales_record_note(); } -add_action( 'wc_admin_daily', 'do_wc_admin_daily' ); +add_action( 'wc_admin_daily', 'wc_admin_do_wc_admin_daily' ); /** * Initializes wc-admin daily action when plugin activated. */ -function activate_wc_admin_plugin() { - if ( ! dependencies_satisfied() ) { +function wc_admin_activate_wc_admin_plugin() { + if ( ! wc_admin_dependencies_satisfied() ) { return; } @@ -106,33 +106,33 @@ function activate_wc_admin_plugin() { wp_schedule_event( time(), 'daily', 'wc_admin_daily' ); } } -register_activation_hook( WC_ADMIN_PLUGIN_FILE, 'activate_wc_admin_plugin' ); +register_activation_hook( WC_ADMIN_PLUGIN_FILE, 'wc_admin_activate_wc_admin_plugin' ); /** * Deactivate wc-admin plugin if dependencies not satisfied. */ -function possibly_deactivate_wc_admin_plugin() { - if ( ! dependencies_satisfied() ) { +function wc_admin_possibly_deactivate_wc_admin_plugin() { + if ( ! wc_admin_dependencies_satisfied() ) { deactivate_plugins( plugin_basename( WC_ADMIN_PLUGIN_FILE ) ); unset( $_GET['activate'] ); } } -add_action( 'admin_init', 'possibly_deactivate_wc_admin_plugin' ); +add_action( 'admin_init', 'wc_admin_possibly_deactivate_wc_admin_plugin' ); /** * On deactivating the wc-admin plugin. */ -function deactivate_wc_admin_plugin() { +function wc_admin_deactivate_wc_admin_plugin() { wp_clear_scheduled_hook( 'wc_admin_daily' ); WC_Admin_Reports_Sync::clear_queued_actions(); } -register_deactivation_hook( WC_ADMIN_PLUGIN_FILE, 'deactivate_wc_admin_plugin' ); +register_deactivation_hook( WC_ADMIN_PLUGIN_FILE, 'wc_admin_deactivate_wc_admin_plugin' ); /** * Set up the plugin, only if we can detect both Gutenberg and WooCommerce */ function wc_admin_plugins_loaded() { - if ( ! dependencies_satisfied() ) { + if ( ! wc_admin_dependencies_satisfied() ) { add_action( 'admin_notices', 'wc_admin_plugins_notice' ); return; }