Fix an issue that prevented the admin dashboard from opening when woo…

…-commerce was not installed or active
michelve · Dec 19, 2019 · 22a87ea · 22a87ea
1 parent a38a7e5
commit 22a87ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ sftp-config_.json
 sftp-config.json
 sftp-config-alt.json
 Icon
+package-lock.json
 .Icon
diff --git a/admin/slm-admin-init.php b/admin/slm-admin-init.php
@@ -4,7 +4,6 @@
     die;
 }
 
-
 require_once SLM_ADMIN . 'slm-manage-licenses.php';
 require_once SLM_ADMIN . 'slm-add-licenses.php';
 require_once SLM_ADMIN . 'slm-lic-settings.php';

diff --git a/includes/slm-scripts.php b/includes/slm-scripts.php
@@ -16,9 +16,13 @@ function slm_frontend_assets() {
     /**
      * Check if WooCommerce is activated
      */
-    if (!function_exists('is_woocommerce_activated') && is_account_page()) {
-        wp_enqueue_style('bootstrapcdn-slm', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css');
-        wp_enqueue_script( 'bootstrapcdn-slm-js', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', array('jquery'), '4.1.3', true );
+    if (is_plugin_active('woocommerce/woocommerce.php'))  {
+
+        if(is_account_page()) {
+            wp_enqueue_style('bootstrapcdn-slm', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css');
+            wp_enqueue_script('bootstrapcdn-slm-js', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', array('jquery'), '4.1.3', true);
+        }
+
     }
     // custom css
     wp_enqueue_style('softwarelicensemanager', SLM_ASSETS_URL .'css/slm-front-end.css');
@@ -28,17 +32,17 @@ function slm_frontend_assets() {
 add_action('admin_enqueue_scripts', 'slm_admin_assets');
 
 
+
 /**
  * Check if WooCommerce is activated
  */
-if (!function_exists('is_woocommerce_activated')) {
+if (is_plugin_active('woocommerce/woocommerce.php')) {
     add_action('template_redirect', 'slm_get_page');
-}
 
-function slm_get_page(){
-    if (is_page('my-account')) {
-        add_action('wp_enqueue_scripts', 'slm_js_license');
+    function slm_get_page()
+    {
+        if (is_page('my-account')) {
+            add_action('wp_enqueue_scripts', 'slm_js_license');
+        }
     }
 }
-
-