| @@ -255,8 +255,9 @@ | ||
| 255 | 255 | |
| 256 | 256 | wp_enqueue_style('setup-wizard', WPFNL_URL . 'admin/assets/css/wpfnl-admin.css', false, '1.1', 'all'); |
| 257 | 257 | wp_enqueue_script('setup-wizard-runtime', WPFNL_URL . 'admin/assets/dist/runtime/index.min.js', array(), time(), true); |
| 258 | 258 | wp_enqueue_script('setup-wizard', WPFNL_URL . 'admin/assets/dist/js/setup-wizard.min.js', array('jquery', 'wp-util', 'updates', 'setup-wizard-runtime'), time(), true); |
| 259 | + Wpfnl_functions::enqueue_bundle_style( 'setup-wizard', 'setup-wizard-bundle' ); | |
| 259 | 260 | wp_localize_script('setup-wizard', 'setup_wizard_obj', |
| 260 | 261 | array( |
| 261 | 262 | 'rest_api_url' => esc_url_raw(get_rest_url()), |
| 262 | 263 | 'ajax_url' => esc_url_raw(admin_url('admin-ajax.php')), |
| @@ -287,9 +288,8 @@ | ||
| 287 | 288 | 'is_ff_active' => is_plugin_active( 'fluentform/fluentform.php' ) ? 'yes' : 'no', |
| 288 | 289 | 'is_cl_active' => is_plugin_active( 'cart-lift/cart-lift.php' ) ? 'yes' : 'no', |
| 289 | 290 | 'is_qb_active' => is_plugin_active( 'qubely/qubely.php' ) ? 'yes' : 'no', |
| 290 | 291 | 'is_pro_active' => Wpfnl_functions::is_wpfnl_pro_activated() ? 'yes' : 'no', |
| 291 | - 'funnel_type' => $this->get_funnel_type(), | |
| 292 | 292 | 'getPlugins' => $this->get_essential_plugins(), |
| 293 | 293 | 'defaultSettings' => Wpfnl_functions::get_general_settings(), |
| 294 | 294 | 'logo_url' => WPFNL_URL .'admin/assets/images/setup-funnel-logo.png', |
| 295 | 295 | 'welcome_image' => WPFNL_URL .'admin/assets/images/welcome-image.png', |
| @@ -379,23 +379,8 @@ | ||
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | |
| 383 | - /** | |
| 384 | - * Get funnel type | |
| 385 | - * | |
| 386 | - * @since 2.5.3 | |
| 387 | - */ | |
| 388 | - private function get_funnel_type(){ | |
| 389 | - $general_settings = get_option( '_wpfunnels_general_settings' ); | |
| 390 | - if( isset($general_settings['funnel_type']) ){ | |
| 391 | - if( 'woocommerce' == $general_settings['funnel_type'] ){ | |
| 392 | - return 'sales'; | |
| 393 | - } | |
| 394 | - return $general_settings['funnel_type']; | |
| 395 | - } | |
| 396 | - return 'sales'; | |
| 397 | - } | |
| 398 | 383 | |
| 399 | 384 | |
| 400 | 385 | |
| 401 | 386 | |
