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

show/hide suggestions based on which extensions are active: 

- was previously based on folder names of installed plugins
This commit is contained in:
haszari 2019-02-27 10:13:48 +13:00
parent cc857be201
commit 69e3856188
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/admin/marketplace-suggestions.js
View File

@ -248,7 +248,7 @@
// hide promos for things the user already has installed
promos = _.filter( promos, function( promo ) {
return ! _.contains( marketplace_suggestions.installed_woo_plugins, promo['hide-if-installed'] );
return ! _.contains( marketplace_suggestions.active_plugins, promo['hide-if-installed'] );
} );
// hide promos that are not applicable based on user's installed extensions
@ -259,7 +259,7 @@
}
// if the user has any of the prerequisites, show the promo
return ( _.intersection( marketplace_suggestions.installed_woo_plugins, promo['show-if-installed'] ).length > 0 );
return ( _.intersection( marketplace_suggestions.active_plugins, promo['show-if-installed'] ).length > 0 );
} );
return promos;

6
includes/admin/class-wc-admin-assets.php
View File

@ -73,7 +73,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
wc_deprecated_function( 'The woocommerce_admin_css action', '2.3', 'admin_enqueue_scripts' );
}
if ( WC_Marketplace_Suggestions::show_suggestions_for_screen( $screen_id ) ) {
if ( WC_Marketplace_Suggestions::allow_suggestions() && in_array( $screen_id, array( 'edit-product' ), true ) ) {
wp_enqueue_style( 'woocommerce_admin_marketplace_styles' );
}
}
@ -424,7 +424,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
}
if ( WC_Marketplace_Suggestions::show_suggestions_for_screen( $screen_id ) ) {
$woo_plugin_slugs = WC_Helper::get_local_woo_plugin_slugs();
$active_plugin_slugs = array_map( 'dirname', get_option( 'active_plugins' ) );
wp_register_script(
'marketplace-suggestions',
WC()->plugin_url() . '/assets/js/admin/marketplace-suggestions' . $suffix . '.js',
@ -437,7 +437,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
'marketplace_suggestions',
array(
'dismiss_suggestion_nonce' => wp_create_nonce( 'add_dismissed_marketplace_suggestion' ),
'installed_woo_plugins' => $woo_plugin_slugs,
'active_plugins' => $active_plugin_slugs,
'dismissed_suggestions' => WC_Marketplace_Suggestions::get_dismissed_suggestions(),
'suggestions_data' => WC_Marketplace_Suggestions::get_suggestions_api_data(),
)