Hide simplify notice outside of US

This commit is contained in:
Mike Jolley 2016-05-16 11:30:20 +01:00
parent 87e9ccd343
commit dce5c312e5
1 changed files with 2 additions and 2 deletions

View File

@ -86,7 +86,7 @@ class WC_Admin_Notices {
$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] ) {
if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] && in_array( WC()->countries->get_base_country(), apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
WC_Admin_Notices::add_notice( 'simplify_commerce' );
}
@ -304,7 +304,7 @@ class WC_Admin_Notices {
* Simplify Commerce is being removed from core.
*/
public static function simplify_commerce_notice() {
if ( class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) ) {
if ( class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) || ! in_array( WC()->countries->get_base_country(), apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
self::remove_notice( 'simplify_commerce' );
return;
}