| @@ -40,8 +40,11 @@ | ||
| 40 | 40 | if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Booking_Calendar ) ) { |
| 41 | 41 | |
| 42 | 42 | self::$instance = new Booking_Calendar; |
| 43 | 43 | self::$instance->includes(); |
| 44 | + if ( defined( 'WPBC_BOOKING_MODES_ACTIVE_ENGINE' ) && 'none' === WPBC_BOOKING_MODES_ACTIVE_ENGINE ) { | |
| 45 | + return self::$instance; | |
| 46 | + } | |
| 44 | 47 | self::$instance->define_version(); |
| 45 | 48 | |
| 46 | 49 | add_action( 'init', array( self::$instance, 'wp_inited' ) ); |
| 47 | 50 | |
| @@ -255,14 +258,16 @@ | ||
| 255 | 258 | 'browser_header' => __( 'Settings', 'booking' ) . ' - ' . __( 'Booking Calendar', 'booking' ), |
| 256 | 259 | 'user_role' => get_bk_option( 'booking_user_role_settings' ), |
| 257 | 260 | ) ); |
| 258 | 261 | |
| 259 | - if ( ( wpbc_is_user_can_access_wizard_page() ) && ( ! wpbc_setup_wizard_page__is_all_steps_completed() ) ) { | |
| 262 | + if ( wpbc_is_user_can_access_wizard_page() ) { | |
| 260 | 263 | |
| 261 | - $setup_steps = new WPBC_SETUP_WIZARD_STEPS(); | |
| 264 | + $setup_steps = new WPBC_SETUP_WIZARD_STEPS(); | |
| 265 | + $is_setup_menu_visible = wpbc_setup_wizard_is_initial_install_site() | |
| 266 | + && ! $setup_steps->db__is_all_steps_completed(); | |
| 262 | 267 | |
| 263 | 268 | self::$instance->admin_menu['setup'] = new WPBC_Admin_Menus( 'wpbc-setup', array( |
| 264 | - 'in_menu' => 'wpbc', | |
| 269 | + 'in_menu' => $is_setup_menu_visible ? 'wpbc' : false, | |
| 265 | 270 | 'menu_title' => $setup_steps->get_plugin_menu_title__setup_progress(), |
| 266 | 271 | 'page_header' => ucwords( __( 'Setup', 'booking' ) ), |
| 267 | 272 | 'browser_header' => ucwords( __( 'Setup', 'booking' ) ) . ' - ' . __( 'Booking Calendar', 'booking' ), |
| 268 | 273 | 'user_role' => get_bk_option( 'booking_user_role_settings' ), |
