Changeset 3377998

Timestamp:

10/14/2025 09:59:55 AM (4 months ago)

Author:

impleCode

Message:

• Added [product_size] shortcode
• Added [product_weight] shortcode
• Fixed checkout state field

Location:

ecommerce-product-catalog/trunk

Files:

• ecommerce-product-catalog.php (modified) (1 diff)
• functions/content-functions.php (modified) (1 diff)
• modules/attributes/attributes-shortcodes.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• templates/full/product-page-inside.php (modified) (4 diffs)
• templates/shortcode-catalog.php (modified) (3 diffs)
• templates/templates-functions.php (modified) (39 diffs)

ecommerce-product-catalog/trunk/ecommerce-product-catalog.php

@@ -4 +4 @@
  * Plugin URI: https://implecode.com/wordpress/product-catalog/#cam=in-plugin-urls&key=plugin-url
  * Description: Easy to use, powerful and beautiful WordPress eCommerce plugin from impleCode. A Great choice if you want to sell easy and quick. Or beautifully present your products on a WordPress website. Full WordPress integration does a great job not only for Merchants but also for Developers and Theme Constructors.
- * Version: 3.4.10
+ * Version: 3.4.11
  * Author: impleCode
  * Author URI: https://implecode.com/#cam=in-plugin-urls&key=author-url

ecommerce-product-catalog/trunk/functions/content-functions.php

@@ -132 +132 @@
         'loading'             => get_site_url() . '/wp-includes/js/thickbox/loadingAnimation.gif',
     ) );
-    if ( is_user_logged_in() ) {
-        $localize['nonce'] = wp_create_nonce( 'ic-ajax-nonce' );
-    }
+    //if ( is_user_logged_in() ) {
+    $localize['nonce'] = wp_create_nonce( 'ic-ajax-nonce' );
+    //}
     wp_localize_script( 'al_product_scripts', 'product_object', $localize );
 }

ecommerce-product-catalog/trunk/modules/attributes/attributes-shortcodes.php

@@ -1 +1 @@
 <?php
 
-if ( !defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly
 }
@@ -9 +9 @@
  * Here all product attributes are defined and managed.
  *
- * @version     1.0.0
- * @package     ecommerce-product-catalog/includes
- * @author      impleCode
+ * @version        1.0.0
+ * @package        ecommerce-product-catalog/includes
+ * @author        impleCode
  */
 add_shortcode( 'product_attributes', 'ic_product_attributes' );
@@ -19 +19 @@
  *
  * @param type $atts
+ *
  * @return string
  */
 function ic_product_attributes( $atts ) {
+    $args       = shortcode_atts( array(
+        'product' => get_the_ID(),
+    ), $atts );
+    $product_id = intval( $args['product'] );
+    if ( empty( $product_id ) ) {
+        return '';
+    }
+
+    return get_product_attributes( $product_id );
+}
+
+add_shortcode( 'product_weight', 'ic_product_weight_shortcode' );
+
+/**
+ * Shows product weight
+ *
+ * @param type $atts
+ *
+ * @return string
+ */
+function ic_product_weight_shortcode( $atts ) {
     $args = shortcode_atts( array(
         'product' => get_the_ID(),
     ), $atts );
-    return get_product_attributes( $args[ 'product' ] );
+
+    $product_id = intval( $args['product'] );
+    if ( empty( $product_id ) ) {
+        return '';
+    }
+
+    return ic_get_product_weight( $product_id );
 }
+
+add_shortcode( 'product_size', 'ic_product_size_shortcode' );
+
+/**
+ * Shows product size
+ *
+ * @param type $atts
+ *
+ * @return string
+ */
+function ic_product_size_shortcode( $atts ) {
+    $args = shortcode_atts( array(
+        'product' => get_the_ID(),
+    ), $atts );
+
+    $product_id = intval( $args['product'] );
+    if ( empty( $product_id ) ) {
+        return '';
+    }
+
+    return ic_get_product_size( $product_id );
+}

ecommerce-product-catalog/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.8
 Requires PHP: 5.6
-Stable tag: 3.4.10
+Stable tag: 3.4.11
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -390 +390 @@
 Use [EPC Translate Project](https://translate.wordpress.org/projects/wp-plugins/ecommerce-product-catalog "eCommerce Product Catalog Translation Project") to add new or fix the existing translations in eCommerce Product Catalog. Use [Premium EPC Translation Project](https://translate.implecode.com/projects/ "eCommerce Product Catalog Translation Project") for all the extensions.
 
+= 3.4.11 - 14/10/2025 =
+
+* Added [product_size] shortcode
+* Added [product_weight] shortcode
+* Fixed checkout state field
+
 = 3.4.10 - 22/09/2025 =
 

ecommerce-product-catalog/trunk/templates/full/product-page-inside.php

@@ -1 +1 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-    exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
@@ -19 +19 @@
 $this_product_id = ic_get_product_id();
 if ( $this_product_id && $this_product_id !== $product_id ) {
-    $product_id = $this_product_id;
-    $product    = get_post( $product_id );
-    setup_postdata( $product );
+    $product_id = $this_product_id;
+    $product    = get_post( $product_id );
+    setup_postdata( $product );
 }
 if ( empty( $product ) ) {
-    return;
+    return;
 }
 $taxonomy       = get_current_screen_tax();
@@ -32 +32 @@
 
     <div id="product_details_container">
-        <?php
-        do_action( 'before_product_details', $product_id, $single_options );
-        $details_class = product_gallery_enabled( $single_options['enable_product_gallery'], $single_options['enable_product_gallery_only_when_exist'], $product );
-        ?>
+        <?php
+        do_action( 'before_product_details', $product_id, $single_options );
+        $details_class = product_gallery_enabled( $single_options['enable_product_gallery'], $single_options['enable_product_gallery_only_when_exist'], $product );
+        ?>
         <div id="product_details" class="product-details <?php echo $details_class; ?>">
-            <?php
-            do_action( 'product_details', $product, $single_names );
-            ?>
+            <?php
+            do_action( 'product_details', $product, $single_names );
+            ?>
         </div>
-        <?php
-        do_action( 'product_details_container_end', $product, $single_names );
-        ?>
+        <?php
+        do_action( 'product_details_container_end', $product, $single_names );
+        ?>
     </div>
 <?php
 if ( current_user_can( 'edit_products' ) ) {
-    do_action( 'ic_product_admin_actions', $product );
+    do_action( 'ic_product_admin_actions', $product );
 }
 ob_start();
@@ -53 +53 @@
 $after_product_details = ob_get_clean();
 if ( ! empty( $after_product_details ) ) {
-    ?>
+    ?>
     <div id="after-product-details" class="after-product-details">
-        <?php echo $after_product_details ?>
+        <?php echo $after_product_details ?>
     </div>
-    <?php
+    <?php
 }
 do_action( "after_after_product_details", $product, $single_names );
 ?>
     <div class="after-product-description">
-        <?php do_action( 'single_product_end', $product, $single_names, $taxonomy ); ?>
+        <?php do_action( 'single_product_end', $product, $single_names, $taxonomy ); ?>
     </div>
 

ecommerce-product-catalog/trunk/templates/shortcode-catalog.php

@@ -1 +1 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-    exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
@@ -13 +13 @@
 class ic_shortcode_catalog {
 
-    private $multiple_settings, $status = 'catalog', $title = '', $after_header = 0, $loop_started = 0, $settings = array(), $the_content_filters = array(), $shortcode_listing_generated = 0, $post_type = '';
-
-    function __construct() {
-        add_shortcode( 'show_product_catalog', array( $this, 'catalog_shortcode' ) );
-        add_action( 'init', array( $this, 'init' ) );
-    }
-
-    function init() {
-        add_action( 'wp_ajax_ic_assign_listing', array( $this, 'assign_listing' ) );
-        if ( ! is_ic_shortcode_integration() ) {
-            return;
-        }
-        $this->settings = ic_get_shortcode_mode_settings();
-        add_action( 'ic_catalog_wp', array( $this, 'hooks' ) );
-
-        add_action( 'ic_shortcode_mode_settings_html', array( $this, 'settings_html' ) );
-        add_action( 'ic_after_main_catalog_page_setting_html', array( $this, 'main_catalog_page_warning' ) );
-        add_filter( 'ic_archive_multiple_settings_validation', array( $this, 'update_template' ) );
-        add_action( 'ic_ajax_self_submit_init', array( $this, 'is_ajax_inside_shortcode' ), 10, 3 );
-        do_action( 'ic_shortcode_integration_init' );
-    }
-
-    function hooks() {
-        if ( ! is_ic_catalog_page() || apply_filters( 'ic_shortcode_catalog_apply', false ) ) {
-            return;
-        }
-        $this->get_pre_shortcode_query();
-        $this->get_pre_shortcode_post();
-        remove_all_actions( 'loop_no_results' );
-        add_action( 'loop_no_results', array( $this, 'no_results_show_catalog' ) );
-
-        add_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
-
-        add_action( 'ic_catalog_template_redirect', array( $this, 'overwrite_query' ), 999 );
-        add_action( 'get_header', array( $this, 'catalog_query' ), 999, 0 );
-        add_filter( 'ic_catalog_body_class_start', array( $this, 'overwrite_query' ), 1 );
-        ////add_filter( 'ic_catalog_single_body_class', array( $this, 'catalog_query' ), 99, 1 );
-        ////add_filter( 'ic_catalog_tax_body_class', array( $this, 'catalog_query' ), 98, 1 );
-        add_filter( 'ic_catalog_tax_body_class', array( $this, 'tax_body_class' ), 98, 1 );
-        add_filter( 'ic_catalog_single_body_class', array( $this, 'single_body_class' ), 98, 1 );
+    private $multiple_settings, $status = 'catalog', $title = '', $after_header = 0, $loop_started = 0, $settings = array(), $the_content_filters = array(), $shortcode_listing_generated = 0, $post_type = '';
+
+    function __construct() {
+        add_shortcode( 'show_product_catalog', array( $this, 'catalog_shortcode' ) );
+        add_action( 'init', array( $this, 'init' ) );
+    }
+
+    function init() {
+        add_action( 'wp_ajax_ic_assign_listing', array( $this, 'assign_listing' ) );
+        if ( ! is_ic_shortcode_integration() ) {
+            return;
+        }
+        $this->settings = ic_get_shortcode_mode_settings();
+        add_action( 'ic_catalog_wp', array( $this, 'hooks' ) );
+
+        add_action( 'ic_shortcode_mode_settings_html', array( $this, 'settings_html' ) );
+        add_action( 'ic_after_main_catalog_page_setting_html', array( $this, 'main_catalog_page_warning' ) );
+        add_filter( 'ic_archive_multiple_settings_validation', array( $this, 'update_template' ) );
+        add_action( 'ic_ajax_self_submit_init', array( $this, 'is_ajax_inside_shortcode' ), 10, 3 );
+        do_action( 'ic_shortcode_integration_init' );
+    }
+
+    function hooks() {
+        if ( ! is_ic_catalog_page() || apply_filters( 'ic_shortcode_catalog_apply', false ) ) {
+            return;
+        }
+        $this->get_pre_shortcode_query();
+        $this->get_pre_shortcode_post();
+        remove_all_actions( 'loop_no_results' );
+        add_action( 'loop_no_results', array( $this, 'no_results_show_catalog' ) );
+
+        add_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
+
+        add_action( 'ic_catalog_template_redirect', array( $this, 'overwrite_query' ), 999 );
+        add_action( 'get_header', array( $this, 'catalog_query' ), 999, 0 );
+        add_filter( 'body_class', array( $this, 'body_class' ), 1, 2 );
+        add_filter( 'ic_catalog_body_class_start', array( $this, 'overwrite_query' ), 1 );
+        ////add_filter( 'ic_catalog_single_body_class', array( $this, 'catalog_query' ), 99, 1 );
+        ////add_filter( 'ic_catalog_tax_body_class', array( $this, 'catalog_query' ), 98, 1 );
+        add_filter( 'ic_catalog_tax_body_class', array( $this, 'tax_body_class' ), 98, 1 );
+        add_filter( 'ic_catalog_single_body_class', array( $this, 'single_body_class' ), 98, 1 );
 //add_filter( 'ic_catalog_body_class', array( $this, 'catalog_query' ), 98 );
-        //add_filter( 'get_custom_logo', array( $this, 'catalog_query' ), 98 );
-
-        add_filter( 'ic_catalog_pre_nav_menu', array( $this, 'remove_overwrite_filters' ), 99 );
+        //add_filter( 'get_custom_logo', array( $this, 'catalog_query' ), 98 );
+
+        add_filter( 'ic_catalog_pre_nav_menu', array( $this, 'remove_overwrite_filters' ), 99 );
 //add_filter( 'ic_catalog_tax_nav_menu', array( $this, 'fake_tax_first_post' ), 99 );
 //add_filter( 'ic_catalog_tax_nav_menu', array( $this, 'overwrite_query' ), 99 );
-        add_filter( 'ic_catalog_pre_nav_menu_items', array( $this, 'remove_title_override' ) );
-        add_filter( 'ic_catalog_pre_nav_menu', array( $this, 'remove_title_override' ), - 2 );
-        add_filter( 'ic_catalog_nav_menu_items', array( $this, 'add_title_override' ) );
-        add_filter( 'wp_list_pages_excludes', array( $this, 'remove_title_override' ), - 2 );
-        add_filter( 'wp_list_pages', array( $this, 'add_title_override' ), 999 );
-        add_filter( 'ic_catalog_nav_menu', array( $this, 'add_title_override' ), 99 );
-        ////add_filter( 'ic_catalog_single_nav_menu', array( $this, 'catalog_query' ), 99 );
-        add_filter( 'breadcrumb_trail_args', array( $this, 'remove_title_override' ) );
-        add_filter( 'breadcrumb_trail_args', array( $this, 'catalog_query' ), 99 );
-        //add_filter( 'breadcrumb_trail', array( $this, 'overwrite_query' ), 99 );
-        add_filter( 'breadcrumb_trail', array( $this, 'add_title_override' ), 99 );
-
-
-        add_filter( 'ic_catalog_listing_nav_menu', array( $this, 'fake_listing_first_post' ), 99 );
-        add_action( 'get_template_part', array( $this, 'overwrite_query' ), 99, 0 );
-        add_action( 'wp_after_load_template', array( $this, 'overwrite_query' ), 99, 0 );
-        //add_action( 'get_template_part', array( $this, 'break_query' ), 100, 0 ); // Shows no content when multiple loops present
+        add_filter( 'ic_catalog_pre_nav_menu_items', array( $this, 'remove_title_override' ) );
+        add_filter( 'ic_catalog_pre_nav_menu', array( $this, 'remove_title_override' ), - 2 );
+        add_filter( 'ic_catalog_nav_menu_items', array( $this, 'add_title_override' ) );
+        add_filter( 'wp_list_pages_excludes', array( $this, 'remove_title_override' ), - 2 );
+        add_filter( 'wp_list_pages', array( $this, 'add_title_override' ), 999 );
+        add_filter( 'ic_catalog_nav_menu', array( $this, 'add_title_override' ), 99 );
+        ////add_filter( 'ic_catalog_single_nav_menu', array( $this, 'catalog_query' ), 99 );
+        add_filter( 'breadcrumb_trail_args', array( $this, 'remove_title_override' ) );
+        add_filter( 'breadcrumb_trail_args', array( $this, 'catalog_query' ), 99 );
+        //add_filter( 'breadcrumb_trail', array( $this, 'overwrite_query' ), 99 );
+        add_filter( 'breadcrumb_trail', array( $this, 'add_title_override' ), 99 );
+
+
+        add_filter( 'ic_catalog_listing_nav_menu', array( $this, 'fake_listing_first_post' ), 99 );
+        add_action( 'get_template_part', array( $this, 'overwrite_query' ), 99, 0 );
+        add_action( 'wp_after_load_template', array( $this, 'overwrite_query' ), 99, 0 );
+        //add_action( 'get_template_part', array( $this, 'break_query' ), 100, 0 ); // Shows no content when multiple loops present
 //add_action( 'get_template_part_content', array( $this, 'overwrite_query' ), 101, 0 );
 //add_action( 'get_template_part_loop', array( $this, 'overwrite_query' ), 101, 0 );
 //add_action( 'get_template_part_index', array( $this, 'overwrite_query' ), 101, 0 );
 //( 'get_template_part_page', array( $this, 'overwrite_query' ), 101, 0 );
-        //add_filter( 'post_class', array( $this, 'catalog_query' ), -2 );
-        add_filter( 'post_class', array( $this, 'overwrite_query' ), - 2 );
-        add_filter( 'post_class', array( $this, 'check_post_class' ), 99 );
-        //add_filter( 'post_class', array( $this, 'overwrite_query' ), 999 );
-        //add_filter( 'post_class', array( $this, 'catalog_query' ), 999 ); //Better to add it only for some themes
-        if ( ! empty( $this->settings['show_everywhere'] ) ) {
-            add_action( 'ic_catalog_wp_head_start', array( $this, 'catalog_query_force' ), - 1, 0 );
-        } else {
-            add_action( 'ic_catalog_wp_head_start', array( $this, 'catalog_query' ), - 1, 0 );
-        }
-        add_action( 'ic_catalog_wp_head', array( $this, 'set_after_header' ), 9999, 0 );
+        //add_filter( 'post_class', array( $this, 'catalog_query' ), -2 );
+        add_filter( 'post_class', array( $this, 'overwrite_query' ), - 2 );
+        add_filter( 'post_class', array( $this, 'check_post_class' ), 99 );
+        //add_filter( 'post_class', array( $this, 'overwrite_query' ), 999 );
+        //add_filter( 'post_class', array( $this, 'catalog_query' ), 999 ); //Better to add it only for some themes
+        if ( ! empty( $this->settings['show_everywhere'] ) ) {
+            add_action( 'ic_catalog_wp_head_start', array( $this, 'catalog_query_force' ), - 1, 0 );
+        } else {
+            add_action( 'ic_catalog_wp_head_start', array( $this, 'catalog_query' ), - 1, 0 );
+        }
+        add_action( 'ic_catalog_wp_head', array( $this, 'set_after_header' ), 9999, 0 );
 //add_action( 'ic_catalog_listing_wp_head', array( $this, 'overwrite_query' ), 999 );
-        add_action( 'ic_catalog_search_wp_head', array( $this, 'overwrite_query' ), 999 );
-
-        add_filter( 'single_post_title', array( $this, 'product_page_title' ), 99, 1 );
-
-        add_action( 'loop_start', array( $this, 'loop_start' ), 10, 1 );
-        add_action( 'loop_end', array( $this, 'loop_end' ) );
-
-        add_action( 'shortcode_catalog_init', array( $this, 'catalog_query' ), 10, 0 );
-        add_action( 'shortcode_catalog_init', array( $this, 'remove_overwrite_filters' ) );
-        add_action( 'product_listing_begin', array( $this, 'remove_overwrite_filters' ) );
-
-        add_action( 'admin_bar_menu', array( $this, 'catalog_query' ), - 1, 0 );
-        add_action( 'admin_bar_menu', array( $this, 'overwrite_query' ), 9999, 0 );
-
-        add_action( 'wp_footer', array( $this, 'catalog_query' ), - 1, 0 );
-        add_action( 'wp_footer', array( $this, 'overwrite_query' ), 9999, 0 );
-
-        add_action( 'ic_before_widget', array( $this, 'widget_switch_before' ) );
-        add_action( 'ic_after_widget', array( $this, 'widget_switch_after' ) );
-
-        add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-
-        //add_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99999999 );
-        add_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99 );
-
-        add_filter( 'the_content', array( $this, 'the_content_filter' ), - 999 );
-
-        add_filter( 'next_post_link', array( $this, 'next_previous_post_link' ) );
-        add_filter( 'previous_post_link', array( $this, 'next_previous_post_link' ) );
-
-        add_filter( 'comments_open', array( $this, 'disable_comments' ), 10, 2 );
-
-        add_action( 'ic_catalog_set_product_id', array( $this, 'catalog_query' ), - 1, 0 );
-
-        add_filter( 'ic_catalog_force_product_header', array( $this, 'force_product_header' ) );
-        add_filter( 'ic_catalog_force_category_header', array( $this, 'force_category_header' ) );
-        $this->default_the_content();
-        $this->theme_specific();
-        do_action( 'ic_shortcode_catalog_hooks_added', $this );
-    }
-
-    function is_ajax_inside_shortcode( $ajax_query_vars, $params, $pre_ajax_query_vars ) {
-        if ( ! empty( $pre_ajax_query_vars['page_id'] ) ) {
-            $listing_id = get_product_listing_id();
-            if ( $listing_id == $pre_ajax_query_vars['page_id'] ) {
-
-                return;
-            }
-            $post = get_post( $pre_ajax_query_vars['page_id'] );
-            if ( isset( $post->post_content ) && ic_has_page_catalog_shortcode( $post ) && is_product_filters_active() ) {
-                ic_save_global( 'inside_show_catalog_shortcode', 1 );
-            }
-        }
-    }
-
-    function default_the_content() {
-        $this->the_content_filters = array();
-        $to_remove                 = array( 'basic_social_share_buttons' );
-        foreach ( $to_remove as $remove ) {
-            if ( ! function_exists( $remove ) ) {
-                continue;
-            }
-            remove_filter( 'the_content', $remove );
-            $this->the_content_filters[] = $remove;
-        }
-        /*
-          remove_all_filters( 'the_content' );
-          if ( function_exists( 'do_blocks' ) ) {
-          add_filter( 'the_content', 'do_blocks', 9 );
-          }
-          add_filter( 'the_content', 'wptexturize' );
-          add_filter( 'the_content', 'convert_smilies', 20 );
-          add_filter( 'the_content', 'wpautop' );
-          add_filter( 'the_content', 'shortcode_unautop' );
-          add_filter( 'the_content', 'prepend_attachment' );
-          if ( function_exists( 'wp_filter_content_tags' ) ) {
-          add_filter( 'the_content', 'wp_filter_content_tags' );
-          }
-          if ( function_exists( 'wp_replace_insecure_home_url' ) ) {
-          add_filter( 'the_content', 'wp_replace_insecure_home_url' );
-          }
-          add_filter( 'the_content', 'capital_P_dangit', 11 );
-          add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop().
-         *
-         */
-    }
-
-    function reset_the_content() {
-        if ( empty( $this->the_content_filters ) ) {
-            return;
-        }
-        foreach ( $this->the_content_filters as $filter_name ) {
-            add_filter( 'the_content', $filter_name );
-        }
-    }
-
-    function the_content_filter( $return ) {
-        if ( $this->status == 'page' ) {
-            $this->catalog_query();
-            add_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
-        } else {
-            remove_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
-        }
-
-        return $return;
-    }
-
-    function remove_title_override( $nav_menu ) {
-        remove_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
-
-        return $nav_menu;
-    }
-
-    function add_title_override( $nav_menu ) {
-        add_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
-
-        return $nav_menu;
-    }
-
-    function settings_html( $settings ) {
-
-        if ( ! $this->no_page_id() ) {
-            $available_templates = $this->available_templates();
-            if ( is_array( $available_templates ) && ! empty( $available_templates ) ) {
-                $current_template     = $this->get_true_listing_template();
-                $settings['template'] = $current_template;
-                implecode_settings_dropdown( __( 'Template', 'ecommerce-product-catalog' ), 'archive_multiple_settings[shortcode_mode][template]', $settings['template'], array_merge( array( '0' => __( 'Default Template', 'ecommerce-product-catalog' ) ), $this->available_templates() ), 1, null, __( 'Choose one of the available page templates to display catalog pages.', 'ecommerce-product-catalog' ) );
-            }
-        }
-    }
-
-    function main_catalog_page_warning() {
-        if ( $this->no_page_id() ) {
-            $available_templates = $this->available_templates();
-            if ( is_array( $available_templates ) && ! empty( $available_templates ) ) {
-                echo '<br>';
-                implecode_warning( __( "Select an existing page or create new to have an option to choose different page template.", 'ecommerce-product-catalog' ) );
-            }
-        }
-    }
-
-    function force_product_header( $force ) {
-        if ( ! empty( $this->settings['force_name'] ) ) {
-            $force = true;
-        }
-
-        return $force;
-    }
-
-    function force_category_header( $force ) {
-        if ( ! empty( $this->settings['force_category_name'] ) ) {
-            $force = true;
-        }
-
-        return $force;
-    }
-
-    function set_after_header() {
-        $this->after_header = 1;
-    }
-
-    function set_loop_started() {
-        $this->loop_started = 1;
-    }
-
-    function disable_comments( $open, $page_id ) {
-        $listing_id = get_product_listing_id();
-        if ( $page_id === $listing_id ) {
-            return false;
-        }
-
-        return $open;
-    }
-
-    function next_previous_post_link( $link ) {
-        if ( is_ic_product_listing() || is_ic_taxonomy_page() || is_ic_product_search() ) {
-            return '';
-        }
-
-        return $link;
-    }
-
-    function auto_add_shortcode( $content ) {
-        if ( is_ic_product_listing() && ! $this->has_listing_shortcode() ) {
-            if ( ! $this->is_page_builder_edit() ) {
-                $content .= do_shortcode( '[show_product_catalog]' );
-            }
-        }
-
-        return $content;
-    }
-
-    function clear_known( $content ) {
-        if ( empty( $this->settings['show_everywhere'] ) ) {
-            $content = '';
-        }
-
-        if ( empty( $content ) ) {
-            return $content;
-        }
-        add_filter( 'strip_shortcodes_tagnames', array( $this, 'known_shortcodes' ) );
-        $content = strip_shortcodes( $content );
-        remove_filter( 'strip_shortcodes_tagnames', array( $this, 'known_shortcodes' ) );
-
-        $content = $this->strip_blocks( $content );
-
-        return $content;
-    }
-
-    function known_shortcodes() {
-        return array( 'show_products', 'show_categories' );
-    }
-
-    function strip_blocks( $content ) {
-        if ( empty( $content ) ) {
-            return $content;
-        }
-        $block_start  = '<!-- wp:';
-        $block_end    = '/-->';
-        $known_blocks = $this->known_blocks();
-        foreach ( $known_blocks as $block_name ) {
-            $start = strpos( $content, $block_start . $block_name );
-            if ( $start !== false ) {
-                $end = strpos( $content, $block_end, $start );
-                if ( $end !== false ) {
-                    $strip   = substr( $content, $start, $end + strlen( $block_end ) - $start );
-                    $content = trim( str_replace( $strip, '', $content ) );
-                }
-            }
-        }
-
-        return $content;
-    }
-
-    function known_blocks() {
-        if ( function_exists( 'register_block_type' ) ) {
-            return array( 'ic-epc/show-products', 'ic-epc/show-categories' );
-        }
-
-        return array();
-    }
-
-    function forced_meta() {
-        if ( empty( $this->settings['show_everywhere'] ) ) {
-            return array();
-        } else {
-            return array(
-                'et_',
-                '_avia',
-                '_builder',
-                'cs_'
-            );
-        }
-    }
-
-    function included_meta() {
-        return array(
-            '_wp_page_template',
-        );
-    }
-
-    function included_meta_contains() {
-        return array(
-            'sidebar',
-            'layout',
-        );
-    }
-
-    function is_forced_meta( $meta_key ) {
-        $forced_meta = $this->forced_meta();
-        if ( in_array( $meta_key, $forced_meta ) ) {
-            return true;
-        } else {
-            foreach ( $forced_meta as $part ) {
-                if ( ic_string_contains( $meta_key, $part ) ) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    function is_included_meta( $meta_key ) {
-        if ( $this->is_forced_meta( $meta_key ) || in_array( $meta_key, $this->included_meta() ) ) {
-            return true;
-        } else {
-            $excluded_parts = $this->included_meta_contains();
-            foreach ( $excluded_parts as $part ) {
-                if ( ic_string_contains( $meta_key, $part ) ) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    function listing_metadata( $value, $object_id, $meta_key, $single ) {
-        if ( empty( $meta_key ) ) {
-            return $value;
-        }
-        $listing_id = get_product_listing_id();
-        if ( ! is_ic_admin() && $this->is_included_meta( $meta_key ) && ! $this->no_page_id() && ( is_ic_product( $object_id ) || is_ic_product_category( $object_id ) ) ) {
-            remove_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-            $listing_meta = get_post_meta( $listing_id, $meta_key, $single );
-            if ( ! empty( $listing_meta ) ) {
-                $custom_keys = get_post_custom_keys( $object_id );
-                if ( is_array( $custom_keys ) && in_array( $meta_key, $custom_keys ) ) {
-                    $this_meta = get_post_meta( $object_id, $meta_key, $single );
-                    if ( empty( $this_meta ) && $this->is_forced_meta( $meta_key ) ) {
-                        unset( $this_meta );
-                    }
-                }
-                if ( ! isset( $this_meta ) ) {
-                    if ( $single && is_array( $listing_meta ) ) {
-                        $listing_meta = array( $listing_meta );
-                    }
-                    $value = $listing_meta;
-                }
-            } else if ( $meta_key === '_wp_page_template' ) {
-                $catalog_template = $this->get_template();
-                if ( ! empty( $catalog_template ) ) {
-                    return $catalog_template;
-                }
-            }
-            add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-        } else if ( $object_id == $listing_id && $meta_key === '_wp_page_template' ) {
-            $catalog_template = $this->get_template();
-            if ( ! empty( $catalog_template ) || is_numeric( $catalog_template ) ) {
-                return $catalog_template;
-            }
-        } else if ( $meta_key === '_thumbnail_id' && empty( $this->settings['show_everywhere'] ) && $object_id == $listing_id && ! is_ic_product_listing() ) {
-            $value = '';
-        }
-
-        return $value;
-    }
-
-    function get_template() {
-        $current_template           = $this->get_true_listing_template();
-        $this->settings['template'] = $current_template;
-
-        return apply_filters( 'ic_catalog_shortcode_mode_template', $this->settings['template'] );
-    }
-
-    function get_true_listing_template() {
-        if ( $this->no_page_id() ) {
-            return 0;
-        }
-        $listing_id = get_product_listing_id();
-        remove_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-        $current_template = get_post_meta( $listing_id, '_wp_page_template', true );
-        add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-
-        return $current_template;
-    }
-
-    function available_templates() {
-        $theme = wp_get_theme();
-        if ( $theme->exists() ) {
-            $available_templates = $theme->get_page_templates( null, 'page' );
-        } else {
-            $available_templates = array();
-        }
-
-        return $available_templates;
-    }
-
-    function update_template( $new_settings ) {
-        if ( isset( $new_settings['shortcode_mode']['template'] ) ) {
-            $available_templates = $this->available_templates();
-            if ( $new_settings['shortcode_mode']['template'] === '0' || isset( $available_templates[ $new_settings['shortcode_mode']['template'] ] ) ) {
-                $listing_id = get_product_listing_id();
-                if ( ! empty( $listing_id ) ) {
-                    if ( empty( $new_settings['shortcode_mode']['template'] ) && ! is_numeric( $new_settings['shortcode_mode']['template'] ) ) {
-                        delete_post_meta( $listing_id, '_wp_page_template' );
-                    } else {
-                        update_post_meta( $listing_id, '_wp_page_template', $new_settings['shortcode_mode']['template'] );
-                    }
-                }
-            }
-        }
-
-        return $new_settings;
-    }
-
-    function theme_specific() {
-        if ( function_exists( 'genesis_load_framework' ) || function_exists( 'awada_customizer_config' ) ) {
-            remove_filter( 'post_class', array( $this, 'catalog_query' ), 999 );
-        }
-
-        //Customizr
-        add_action( '__before_content', array( $this, 'overwrite_query' ), 99, 0 );
-
-        //theme.co
-        add_action( 'x_get_view', array( $this, 'overwrite_query' ) );
-
-        //Astra
-        add_filter( 'astra_dynamic_theme_css', array( $this, 'overwrite_query' ), - 99 );
-        add_filter( 'astra_dynamic_theme_css', array( $this, 'catalog_query' ), 99 );
-
-        add_filter( 'astra_breadcrumb_trail_args', array( $this, 'remove_title_override' ) );
-        add_filter( 'astra_breadcrumb_trail_args', array( $this, 'catalog_query' ), 99 );
-        add_filter( 'astra_breadcrumb_trail', array( $this, 'add_title_override' ), 99 );
-        //add_filter( 'astra_get_post_id', 'ic_get_product_id', 99 );
-        //DIVI
-        if ( function_exists( 'et_setup_theme' ) ) {
-            add_action( 'wp', array( $this, 'overwrite_query' ), 998 ); // for the dynamic CSS to work correctly
-            add_action( 'wp', array( $this, 'overwrite_query' ), 1 ); // for the custom header template to work
-        }
-    }
-
-    function fix_title( $title, $id = null ) {
-        if ( is_ic_taxonomy_page() || is_ic_product_page() ) {
-            if ( ! empty( $this->title ) && ( empty( $id ) || $id == get_product_listing_id() ) ) {
-                $title = $this->title;
+        add_action( 'ic_catalog_search_wp_head', array( $this, 'overwrite_query' ), 999 );
+
+        add_filter( 'single_post_title', array( $this, 'product_page_title' ), 99, 1 );
+
+        add_action( 'loop_start', array( $this, 'loop_start' ), 10, 1 );
+        add_action( 'loop_end', array( $this, 'loop_end' ) );
+
+        add_action( 'shortcode_catalog_init', array( $this, 'catalog_query' ), 10, 0 );
+        add_action( 'shortcode_catalog_init', array( $this, 'remove_overwrite_filters' ) );
+        add_action( 'product_listing_begin', array( $this, 'remove_overwrite_filters' ) );
+
+        add_action( 'admin_bar_menu', array( $this, 'catalog_query' ), - 1, 0 );
+        add_action( 'admin_bar_menu', array( $this, 'overwrite_query' ), 9999, 0 );
+
+        add_action( 'wp_footer', array( $this, 'catalog_query' ), - 1, 0 );
+        add_action( 'wp_footer', array( $this, 'overwrite_query' ), 9999, 0 );
+
+        add_action( 'ic_before_widget', array( $this, 'widget_switch_before' ) );
+        add_action( 'ic_after_widget', array( $this, 'widget_switch_after' ) );
+
+        add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+
+        //add_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99999999 );
+        add_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99 );
+
+        add_filter( 'the_content', array( $this, 'the_content_filter' ), - 999 );
+
+        add_filter( 'next_post_link', array( $this, 'next_previous_post_link' ) );
+        add_filter( 'previous_post_link', array( $this, 'next_previous_post_link' ) );
+
+        add_filter( 'comments_open', array( $this, 'disable_comments' ), 10, 2 );
+
+        add_action( 'ic_catalog_set_product_id', array( $this, 'catalog_query' ), - 1, 0 );
+
+        add_filter( 'ic_catalog_force_product_header', array( $this, 'force_product_header' ) );
+        add_filter( 'ic_catalog_force_category_header', array( $this, 'force_category_header' ) );
+        $this->default_the_content();
+        $this->theme_specific();
+        do_action( 'ic_shortcode_catalog_hooks_added', $this );
+    }
+
+    function is_ajax_inside_shortcode( $ajax_query_vars, $params, $pre_ajax_query_vars ) {
+        if ( ! empty( $pre_ajax_query_vars['page_id'] ) ) {
+            $listing_id = get_product_listing_id();
+            if ( $listing_id == $pre_ajax_query_vars['page_id'] ) {
+
+                return;
+            }
+            $post = get_post( $pre_ajax_query_vars['page_id'] );
+            if ( isset( $post->post_content ) && ic_has_page_catalog_shortcode( $post ) && is_product_filters_active() ) {
+                ic_save_global( 'inside_show_catalog_shortcode', 1 );
+            }
+        }
+    }
+
+    function default_the_content() {
+        $this->the_content_filters = array();
+        $to_remove                 = array( 'basic_social_share_buttons' );
+        foreach ( $to_remove as $remove ) {
+            if ( ! function_exists( $remove ) ) {
+                continue;
+            }
+            remove_filter( 'the_content', $remove );
+            $this->the_content_filters[] = $remove;
+        }
+        /*
+          remove_all_filters( 'the_content' );
+          if ( function_exists( 'do_blocks' ) ) {
+          add_filter( 'the_content', 'do_blocks', 9 );
+          }
+          add_filter( 'the_content', 'wptexturize' );
+          add_filter( 'the_content', 'convert_smilies', 20 );
+          add_filter( 'the_content', 'wpautop' );
+          add_filter( 'the_content', 'shortcode_unautop' );
+          add_filter( 'the_content', 'prepend_attachment' );
+          if ( function_exists( 'wp_filter_content_tags' ) ) {
+          add_filter( 'the_content', 'wp_filter_content_tags' );
+          }
+          if ( function_exists( 'wp_replace_insecure_home_url' ) ) {
+          add_filter( 'the_content', 'wp_replace_insecure_home_url' );
+          }
+          add_filter( 'the_content', 'capital_P_dangit', 11 );
+          add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop().
+         *
+         */
+    }
+
+    function reset_the_content() {
+        if ( empty( $this->the_content_filters ) ) {
+            return;
+        }
+        foreach ( $this->the_content_filters as $filter_name ) {
+            add_filter( 'the_content', $filter_name );
+        }
+    }
+
+    function the_content_filter( $return ) {
+        if ( $this->status == 'page' ) {
+            $this->catalog_query();
+            add_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
+        } else {
+            remove_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
+        }
+
+        return $return;
+    }
+
+    function remove_title_override( $nav_menu ) {
+        remove_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
+
+        return $nav_menu;
+    }
+
+    function add_title_override( $nav_menu ) {
+        add_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
+
+        return $nav_menu;
+    }
+
+    function settings_html( $settings ) {
+
+        if ( ! $this->no_page_id() ) {
+            $available_templates = $this->available_templates();
+            if ( is_array( $available_templates ) && ! empty( $available_templates ) ) {
+                $current_template     = $this->get_true_listing_template();
+                $settings['template'] = $current_template;
+                implecode_settings_dropdown( __( 'Template', 'ecommerce-product-catalog' ), 'archive_multiple_settings[shortcode_mode][template]', $settings['template'], array_merge( array( '0' => __( 'Default Template', 'ecommerce-product-catalog' ) ), $this->available_templates() ), 1, null, __( 'Choose one of the available page templates to display catalog pages.', 'ecommerce-product-catalog' ) );
+            }
+        }
+    }
+
+    function main_catalog_page_warning() {
+        if ( $this->no_page_id() ) {
+            $available_templates = $this->available_templates();
+            if ( is_array( $available_templates ) && ! empty( $available_templates ) ) {
+                echo '<br>';
+                implecode_warning( __( "Select an existing page or create new to have an option to choose different page template.", 'ecommerce-product-catalog' ) );
+            }
+        }
+    }
+
+    function force_product_header( $force ) {
+        if ( ! empty( $this->settings['force_name'] ) ) {
+            $force = true;
+        }
+
+        return $force;
+    }
+
+    function force_category_header( $force ) {
+        if ( ! empty( $this->settings['force_category_name'] ) ) {
+            $force = true;
+        }
+
+        return $force;
+    }
+
+    function set_after_header() {
+        $this->after_header = 1;
+    }
+
+    function set_loop_started() {
+        $this->loop_started = 1;
+    }
+
+    function disable_comments( $open, $page_id ) {
+        $listing_id = get_product_listing_id();
+        if ( $page_id === $listing_id ) {
+            return false;
+        }
+
+        return $open;
+    }
+
+    function next_previous_post_link( $link ) {
+        if ( is_ic_product_listing() || is_ic_taxonomy_page() || is_ic_product_search() ) {
+            return '';
+        }
+
+        return $link;
+    }
+
+    function auto_add_shortcode( $content ) {
+        if ( is_ic_product_listing() && ! $this->has_listing_shortcode() ) {
+            if ( ! $this->is_page_builder_edit() ) {
+                $content .= do_shortcode( '[show_product_catalog]' );
+            }
+        }
+
+        return $content;
+    }
+
+    function clear_known( $content ) {
+        if ( empty( $this->settings['show_everywhere'] ) ) {
+            $content = '';
+        }
+
+        if ( empty( $content ) ) {
+            return $content;
+        }
+        add_filter( 'strip_shortcodes_tagnames', array( $this, 'known_shortcodes' ) );
+        $content = strip_shortcodes( $content );
+        remove_filter( 'strip_shortcodes_tagnames', array( $this, 'known_shortcodes' ) );
+
+        $content = $this->strip_blocks( $content );
+
+        return $content;
+    }
+
+    function known_shortcodes() {
+        return array( 'show_products', 'show_categories' );
+    }
+
+    function strip_blocks( $content ) {
+        if ( empty( $content ) ) {
+            return $content;
+        }
+        $block_start  = '<!-- wp:';
+        $block_end    = '/-->';
+        $known_blocks = $this->known_blocks();
+        foreach ( $known_blocks as $block_name ) {
+            $start = strpos( $content, $block_start . $block_name );
+            if ( $start !== false ) {
+                $end = strpos( $content, $block_end, $start );
+                if ( $end !== false ) {
+                    $strip   = substr( $content, $start, $end + strlen( $block_end ) - $start );
+                    $content = trim( str_replace( $strip, '', $content ) );
+                }
+            }
+        }
+
+        return $content;
+    }
+
+    function known_blocks() {
+        if ( function_exists( 'register_block_type' ) ) {
+            return array( 'ic-epc/show-products', 'ic-epc/show-categories' );
+        }
+
+        return array();
+    }
+
+    function forced_meta() {
+        if ( empty( $this->settings['show_everywhere'] ) ) {
+            return array();
+        } else {
+            return array(
+                    'et_',
+                    '_avia',
+                    '_builder',
+                    'cs_'
+            );
+        }
+    }
+
+    function included_meta() {
+        return array(
+                '_wp_page_template',
+        );
+    }
+
+    function included_meta_contains() {
+        return array(
+                'sidebar',
+                'layout',
+        );
+    }
+
+    function is_forced_meta( $meta_key ) {
+        $forced_meta = $this->forced_meta();
+        if ( in_array( $meta_key, $forced_meta ) ) {
+            return true;
+        } else {
+            foreach ( $forced_meta as $part ) {
+                if ( ic_string_contains( $meta_key, $part ) ) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    function is_included_meta( $meta_key ) {
+        if ( $this->is_forced_meta( $meta_key ) || in_array( $meta_key, $this->included_meta() ) ) {
+            return true;
+        } else {
+            $excluded_parts = $this->included_meta_contains();
+            foreach ( $excluded_parts as $part ) {
+                if ( ic_string_contains( $meta_key, $part ) ) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    function listing_metadata( $value, $object_id, $meta_key, $single ) {
+        if ( empty( $meta_key ) ) {
+            return $value;
+        }
+        $listing_id = get_product_listing_id();
+        if ( ! is_ic_admin() && $this->is_included_meta( $meta_key ) && ! $this->no_page_id() && ( is_ic_product( $object_id ) || is_ic_product_category( $object_id ) ) ) {
+            remove_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+            $listing_meta = get_post_meta( $listing_id, $meta_key, $single );
+            if ( ! empty( $listing_meta ) ) {
+                $custom_keys = get_post_custom_keys( $object_id );
+                if ( is_array( $custom_keys ) && in_array( $meta_key, $custom_keys ) ) {
+                    $this_meta = get_post_meta( $object_id, $meta_key, $single );
+                    if ( empty( $this_meta ) && $this->is_forced_meta( $meta_key ) ) {
+                        unset( $this_meta );
+                    }
+                }
+                if ( ! isset( $this_meta ) ) {
+                    if ( $single && is_array( $listing_meta ) ) {
+                        $listing_meta = array( $listing_meta );
+                    }
+                    $value = $listing_meta;
+                }
+            } else if ( $meta_key === '_wp_page_template' ) {
+                $catalog_template = $this->get_template();
+                if ( ! empty( $catalog_template ) ) {
+                    return $catalog_template;
+                }
+            }
+            add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+        } else if ( $object_id == $listing_id && $meta_key === '_wp_page_template' ) {
+            $catalog_template = $this->get_template();
+            if ( ! empty( $catalog_template ) || is_numeric( $catalog_template ) ) {
+                return $catalog_template;
+            }
+        } else if ( $meta_key === '_thumbnail_id' && empty( $this->settings['show_everywhere'] ) && $object_id == $listing_id && ! is_ic_product_listing() ) {
+            $value = '';
+        }
+
+        return $value;
+    }
+
+    function get_template() {
+        $current_template           = $this->get_true_listing_template();
+        $this->settings['template'] = $current_template;
+
+        return apply_filters( 'ic_catalog_shortcode_mode_template', $this->settings['template'] );
+    }
+
+    function get_true_listing_template() {
+        if ( $this->no_page_id() ) {
+            return 0;
+        }
+        $listing_id = get_product_listing_id();
+        remove_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+        $current_template = get_post_meta( $listing_id, '_wp_page_template', true );
+        add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+
+        return $current_template;
+    }
+
+    function available_templates() {
+        $theme = wp_get_theme();
+        if ( $theme->exists() ) {
+            $available_templates = $theme->get_page_templates( null, 'page' );
+        } else {
+            $available_templates = array();
+        }
+
+        return $available_templates;
+    }
+
+    function update_template( $new_settings ) {
+        if ( isset( $new_settings['shortcode_mode']['template'] ) ) {
+            $available_templates = $this->available_templates();
+            if ( $new_settings['shortcode_mode']['template'] === '0' || isset( $available_templates[ $new_settings['shortcode_mode']['template'] ] ) ) {
+                $listing_id = get_product_listing_id();
+                if ( ! empty( $listing_id ) ) {
+                    if ( empty( $new_settings['shortcode_mode']['template'] ) && ! is_numeric( $new_settings['shortcode_mode']['template'] ) ) {
+                        delete_post_meta( $listing_id, '_wp_page_template' );
+                    } else {
+                        update_post_meta( $listing_id, '_wp_page_template', $new_settings['shortcode_mode']['template'] );
+                    }
+                }
+            }
+        }
+
+        return $new_settings;
+    }
+
+    function theme_specific() {
+        if ( function_exists( 'genesis_load_framework' ) || function_exists( 'awada_customizer_config' ) ) {
+            remove_filter( 'post_class', array( $this, 'catalog_query' ), 999 );
+        }
+
+        //Customizr
+        add_action( '__before_content', array( $this, 'overwrite_query' ), 99, 0 );
+
+        //theme.co
+        add_action( 'x_get_view', array( $this, 'overwrite_query' ) );
+
+        //Astra
+        add_filter( 'astra_dynamic_theme_css', array( $this, 'overwrite_query' ), - 99 );
+        add_filter( 'astra_dynamic_theme_css', array( $this, 'catalog_query' ), 99 );
+
+        add_filter( 'astra_breadcrumb_trail_args', array( $this, 'remove_title_override' ) );
+        add_filter( 'astra_breadcrumb_trail_args', array( $this, 'catalog_query' ), 99 );
+        add_filter( 'astra_breadcrumb_trail', array( $this, 'add_title_override' ), 99 );
+        //add_filter( 'astra_get_post_id', 'ic_get_product_id', 99 );
+        //DIVI
+        if ( function_exists( 'et_setup_theme' ) ) {
+            add_action( 'wp', array( $this, 'overwrite_query' ), 998 ); // for the dynamic CSS to work correctly
+            add_action( 'wp', array( $this, 'overwrite_query' ), 1 ); // for the custom header template to work
+        }
+    }
+
+    function fix_title( $title, $id = null ) {
+        if ( is_ic_taxonomy_page() || is_ic_product_page() ) {
+            if ( ! empty( $this->title ) && ( empty( $id ) || $id == get_product_listing_id() ) ) {
+                $title = $this->title;
 //$title = '';
-            }
-        }
-
-        //remove_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
-        return $title;
-    }
-
-    function widget_switch_before() {
-        if ( ! is_filter_bar() && ! $this->is_inside_shortcode() ) {
-            $this->catalog_query();
-        }
-    }
-
-    function widget_switch_after() {
-        if ( ! is_filter_bar() && ! $this->is_inside_shortcode() ) {
-            $this->overwrite_query();
-        }
-    }
-
-    function loop_start( &$wp_query ) {
-        if ( empty( $this->after_header ) ) {
-            return $wp_query;
-        }
-        if ( $this->is_main_query( $wp_query ) ) {
-            $this->set_loop_started();
-            add_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
-            remove_action( 'loop_start', array( $this, 'loop_start' ), 10, 1 );
-            $this->widget_switch_before();
-            $this->breadcrumbs();
-        } else if ( empty( $this->settings['show_everywhere'] ) && is_ic_product_listing( $wp_query ) && is_ic_product_page() ) {
-            $pre_wp_query = $this->get_pre_shortcode_query();
-            foreach ( $wp_query as $name => $val ) {
-                if ( isset( $pre_wp_query->$name ) ) {
-                    $wp_query->$name = $pre_wp_query->$name;
-                }
-            }
-        }
-
-        return $wp_query;
-    }
-
-    function breadcrumbs() {
-        if ( ! empty( $this->settings['move_breadcrumbs'] ) ) {
-            remove_action( 'single_product_begin', 'add_product_breadcrumbs' );
-            remove_action( 'product_listing_begin', 'add_product_breadcrumbs' );
-            add_product_breadcrumbs();
-        }
-    }
-
-    function loop_end( &$wp_query ) {
-        if ( empty( $this->after_header ) ) {
-            return $wp_query;
-        }
-        if ( $this->is_main_query( $wp_query ) ) {
-            $this->set_loop_started();
-        }
-
-        return $wp_query;
-    }
-
-    function is_main_query( $query = null ) {
-        if ( empty( $query ) ) {
-            global $wp_query;
-            $query = $wp_query;
-        }
-        $pre_query = $this->get_pre_shortcode_query();
-        if ( $pre_query && $pre_query === $query ) {
-            return true;
-        } else if ( ! $pre_query && $query->is_main_query() ) {
-            return true;
-        } else if ( ! empty( $query->ic_main_page_query ) ) {
-            return true;
-        } else if ( ic_get_global( 'ic_shortcode_new_query' ) === $query ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function shortcode_init() {
-        ic_save_global( 'inside_show_catalog_shortcode', 1 );
-        $this->multiple_settings = get_multiple_settings();
-        if ( ! is_ic_catalog_page() ) {
-            return;
-        }
-        $this->reset_the_content();
-        remove_action( 'loop_no_results', array( $this, 'no_results_show_catalog' ) );
-        remove_filter( 'the_title', array( $this, 'title' ), 99, 2 );
-
-        remove_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
-        remove_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99 );
-        remove_filter( 'the_content', array( $this, 'catalog_query' ), - 999 );
-        remove_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
-        remove_all_filters( 'loop_start' );
-        remove_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
-        add_action( 'before_shortcode_catalog', array( $this, 'setup_postdata' ) );
-        add_action( 'before_shortcode_catalog', array( $this, 'setup_loop' ) );
-        add_action( 'after_shortcode_catalog', array( $this, 'end_query' ) );
+            }
+        }
+
+        //remove_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
+        return $title;
+    }
+
+    function widget_switch_before() {
+        if ( ! is_filter_bar() && ! $this->is_inside_shortcode() ) {
+            $this->catalog_query();
+        }
+    }
+
+    function widget_switch_after() {
+        if ( ! is_filter_bar() && ! $this->is_inside_shortcode() ) {
+            $this->overwrite_query();
+        }
+    }
+
+    function loop_start( &$wp_query ) {
+        if ( empty( $this->after_header ) ) {
+            return $wp_query;
+        }
+        if ( $this->is_main_query( $wp_query ) ) {
+            $this->set_loop_started();
+            add_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
+            remove_action( 'loop_start', array( $this, 'loop_start' ), 10, 1 );
+            $this->widget_switch_before();
+            $this->breadcrumbs();
+        } else if ( empty( $this->settings['show_everywhere'] ) && is_ic_product_listing( $wp_query ) && is_ic_product_page() ) {
+            $pre_wp_query = $this->get_pre_shortcode_query();
+            foreach ( $wp_query as $name => $val ) {
+                if ( isset( $pre_wp_query->$name ) ) {
+                    $wp_query->$name = $pre_wp_query->$name;
+                }
+            }
+        }
+
+        return $wp_query;
+    }
+
+    function breadcrumbs() {
+        if ( ! empty( $this->settings['move_breadcrumbs'] ) ) {
+            remove_action( 'single_product_begin', 'add_product_breadcrumbs' );
+            remove_action( 'product_listing_begin', 'add_product_breadcrumbs' );
+            add_product_breadcrumbs();
+        }
+    }
+
+    function loop_end( &$wp_query ) {
+        if ( empty( $this->after_header ) ) {
+            return $wp_query;
+        }
+        if ( $this->is_main_query( $wp_query ) ) {
+            $this->set_loop_started();
+        }
+
+        return $wp_query;
+    }
+
+    function is_main_query( $query = null ) {
+        if ( empty( $query ) ) {
+            global $wp_query;
+            $query = $wp_query;
+        }
+        $pre_query = $this->get_pre_shortcode_query();
+        if ( $pre_query && $pre_query === $query ) {
+            return true;
+        } else if ( ! $pre_query && $query->is_main_query() ) {
+            return true;
+        } else if ( ! empty( $query->ic_main_page_query ) ) {
+            return true;
+        } else if ( ic_get_global( 'ic_shortcode_new_query' ) === $query ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function shortcode_init() {
+        ic_save_global( 'inside_show_catalog_shortcode', 1 );
+        $this->multiple_settings = get_multiple_settings();
+        if ( ! is_ic_catalog_page() ) {
+            return;
+        }
+        $this->reset_the_content();
+        remove_action( 'loop_no_results', array( $this, 'no_results_show_catalog' ) );
+        remove_filter( 'the_title', array( $this, 'title' ), 99, 2 );
+
+        remove_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
+        remove_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99 );
+        remove_filter( 'the_content', array( $this, 'catalog_query' ), - 999 );
+        remove_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
+        remove_all_filters( 'loop_start' );
+        remove_filter( 'the_title', array( $this, 'fix_title' ), 10, 2 );
+        add_action( 'before_shortcode_catalog', array( $this, 'setup_postdata' ) );
+        add_action( 'before_shortcode_catalog', array( $this, 'setup_loop' ) );
+        add_action( 'after_shortcode_catalog', array( $this, 'end_query' ) );
 //add_action( 'the_content', array( $this, 'end_query' ) );
 
-        add_action( 'product_page_inside', 'content_product_adder_single_content' );
-
-        remove_filter( 'post_class', array( $this, 'catalog_query' ), - 2 );
-        remove_filter( 'post_class', array( $this, 'overwrite_query' ), - 2 );
-        remove_filter( 'post_class', array( $this, 'check_post_class' ), 99 );
-        remove_filter( 'post_class', array( $this, 'overwrite_query' ), 999 );
-        remove_filter( 'post_class', array( $this, 'catalog_query' ), 999 );
-
-        remove_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-
-        $this->catalog_query( '', true );
-
-        ic_enqueue_main_catalog_js_css();
-        do_action( 'shortcode_catalog_init' );
-        if ( ! is_ic_product_listing() || $this->no_page_id() ) {
-            rewind_posts();
-        }
-    }
-
-    function catalog_shortcode() {
-        if ( $this->is_inside_shortcode() ) {
-            return;
-        }
-        $cache_meta = 'ic_catalog_shortcode_output';
-        $content    = ic_get_global( $cache_meta );
-
-        if ( $content === false ) {
-            $this->shortcode_init();
-            ob_start();
-            do_action( 'before_shortcode_catalog' );
-            $this->shortcode_product_adder();
-            do_action( 'after_shortcode_catalog' );
-            $content = ob_get_clean();
-            ic_save_global( 'inside_show_catalog_shortcode', 0 );
-            ic_save_global( $cache_meta, $content );
-        }
-
-        return $content;
-    }
-
-    function show_catalog_shortcode() {
-        echo $this->catalog_shortcode();
-    }
-
-    function no_results_show_catalog( $query ) {
-        if ( $this->is_main_query( $query ) ) {
-            $this->show_catalog_shortcode();
-        }
-    }
-
-    function is_inside_shortcode() {
-        $test = ic_get_global( 'inside_show_catalog_shortcode' );
-        if ( ! empty( $test ) ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function advanced_integration_type() {
-        return 'advanced';
-    }
-
-    function is_page_builder_edit() {
-        if ( ! empty( $_POST['is_fb_preview'] ) || ! empty( $_GET['et_fb'] ) ) {
-            // DIVI PAGE BUILDER DETECTED
-            return true;
-        }
-        if ( ! empty( $_GET['elementor-preview'] ) || ( ! empty( $_GET['action'] ) && $_GET['action'] === 'elementor' ) ) {
-            // ELEMENTOR PAGE BUILDER DETECTED
-
-            return true;
-        }
-        if ( ! empty( $_GET['ct_builder'] ) ) {
-            // OXYGEN PAGE BUILDER DETECTED
-            return true;
-        }
-
-        if ( class_exists( 'Elementor\Plugin' ) && \Elementor\Plugin::$instance->editor->is_edit_mode() ) {
-            // ELEMENTOR PAGE BUILDER DETECTED
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function default_message() {
-        if ( ! current_user_can( 'manage_product_settings' ) || ic_is_rendering_catalog_block() ) {
-            return;
-        }
-        $page_url   = product_listing_url();
-        $listing_id = get_product_listing_id();
-        $page_id    = get_the_ID();
-        $post_type  = get_post_type();
-        if ( $this->is_page_builder_edit() ) {
-            return;
-        }
-        if ( $listing_id == $page_id || ic_string_contains( $post_type, 'al_product' ) ) {
-            return;
-        }
-        echo "<style>.ic_spinner{background: url(" . admin_url() . "/images/spinner.gif) no-repeat;display:none;width:20px;height:20px;margin-left:2px;vertical-align:middle;</style>";
-        if ( ! empty( $page_url ) ) {
-            $message = '<p style="margin-bottom: 5px;font-weight: normal;">' . sprintf( __( 'Currently %sanother page%s is set to show main product listing. Would you like to show product listing here instead?', 'ecommerce-product-catalog' ), '<a href="' . $page_url . '">', '</a>' ) . '</p>';
-        } else {
-            $message = '<p style="margin-bottom: 5px;font-weight: normal;">' . __( 'Currently, no page is set to show the main product listing. Would you like to show product listing here?', 'ecommerce-product-catalog' ) . '</p>';
-        }
-        if ( ! empty( $message ) && ! empty( $page_id ) ) {
-            ic_enqueue_main_catalog_js_css();
-            $message .= '<p style="margin-bottom: 5px;">' . __( 'All your individual product pages will include this page slug as a parent.', 'ecommerce-product-catalog' ) . '</p>';
-            $message .= '<button  style="margin-bottom: 5px;" type="button" class="button assign-listing-button ' . design_schemes( 'box', 0 ) . '">' . __( 'Yes', 'ecommerce-product-catalog' ) . '</button><div class="ic_spinner"></div>';
+        add_action( 'product_page_inside', 'content_product_adder_single_content' );
+
+        remove_filter( 'post_class', array( $this, 'catalog_query' ), - 2 );
+        remove_filter( 'post_class', array( $this, 'overwrite_query' ), - 2 );
+        remove_filter( 'post_class', array( $this, 'check_post_class' ), 99 );
+        remove_filter( 'post_class', array( $this, 'overwrite_query' ), 999 );
+        remove_filter( 'post_class', array( $this, 'catalog_query' ), 999 );
+
+        remove_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+
+        $this->catalog_query( '', true );
+
+        ic_enqueue_main_catalog_js_css();
+        do_action( 'shortcode_catalog_init' );
+        if ( ! is_ic_product_listing() || $this->no_page_id() ) {
+            rewind_posts();
+        }
+    }
+
+    function catalog_shortcode() {
+        if ( $this->is_inside_shortcode() ) {
+            return;
+        }
+        $cache_meta = 'ic_catalog_shortcode_output';
+        $content    = ic_get_global( $cache_meta );
+
+        if ( $content === false ) {
+            $this->shortcode_init();
+            ob_start();
+            do_action( 'before_shortcode_catalog' );
+            $this->shortcode_product_adder();
+            do_action( 'after_shortcode_catalog' );
+            $content = ob_get_clean();
+            ic_save_global( 'inside_show_catalog_shortcode', 0 );
+            ic_save_global( $cache_meta, $content );
+        }
+
+        return $content;
+    }
+
+    function show_catalog_shortcode() {
+        echo $this->catalog_shortcode();
+    }
+
+    function no_results_show_catalog( $query ) {
+        if ( $this->is_main_query( $query ) ) {
+            $this->show_catalog_shortcode();
+        }
+    }
+
+    function is_inside_shortcode() {
+        $test = ic_get_global( 'inside_show_catalog_shortcode' );
+        if ( ! empty( $test ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function advanced_integration_type() {
+        return 'advanced';
+    }
+
+    function is_page_builder_edit() {
+        if ( ! empty( $_POST['is_fb_preview'] ) || ! empty( $_GET['et_fb'] ) ) {
+            // DIVI PAGE BUILDER DETECTED
+            return true;
+        }
+        if ( ! empty( $_GET['elementor-preview'] ) || ( ! empty( $_GET['action'] ) && $_GET['action'] === 'elementor' ) ) {
+            // ELEMENTOR PAGE BUILDER DETECTED
+
+            return true;
+        }
+        if ( ! empty( $_GET['ct_builder'] ) ) {
+            // OXYGEN PAGE BUILDER DETECTED
+            return true;
+        }
+
+        if ( class_exists( 'Elementor\Plugin' ) && \Elementor\Plugin::$instance->editor->is_edit_mode() ) {
+            // ELEMENTOR PAGE BUILDER DETECTED
+
+            return true;
+        }
+
+        return false;
+    }
+
+    function default_message() {
+        if ( ! current_user_can( 'manage_product_settings' ) || ic_is_rendering_catalog_block() ) {
+            return;
+        }
+        $page_url   = product_listing_url();
+        $listing_id = get_product_listing_id();
+        $page_id    = get_the_ID();
+        $post_type  = get_post_type();
+        if ( $this->is_page_builder_edit() ) {
+            return;
+        }
+        if ( $listing_id == $page_id || ic_string_contains( $post_type, 'al_product' ) ) {
+            return;
+        }
+        echo "<style>.ic_spinner{background: url(" . admin_url() . "/images/spinner.gif) no-repeat;display:none;width:20px;height:20px;margin-left:2px;vertical-align:middle;</style>";
+        if ( ! empty( $page_url ) ) {
+            $message = '<p style="margin-bottom: 5px;font-weight: normal;">' . sprintf( __( 'Currently %sanother page%s is set to show main product listing. Would you like to show product listing here instead?', 'ecommerce-product-catalog' ), '<a href="' . $page_url . '">', '</a>' ) . '</p>';
+        } else {
+            $message = '<p style="margin-bottom: 5px;font-weight: normal;">' . __( 'Currently, no page is set to show the main product listing. Would you like to show product listing here?', 'ecommerce-product-catalog' ) . '</p>';
+        }
+        if ( ! empty( $message ) && ! empty( $page_id ) ) {
+            ic_enqueue_main_catalog_js_css();
+            $message .= '<p style="margin-bottom: 5px;">' . __( 'All your individual product pages will include this page slug as a parent.', 'ecommerce-product-catalog' ) . '</p>';
+            $message .= '<button  style="margin-bottom: 5px;" type="button" class="button assign-listing-button ' . design_schemes( 'box', 0 ) . '">' . __( 'Yes', 'ecommerce-product-catalog' ) . '</button><div class="ic_spinner"></div>';
 //$message .= '<p style="font-size: 0.8em">* ' . sprintf( __( 'Please remove the %s shortcode to disable this info.', 'ecommerce-product-catalog' ), '[show_product_catalog]' ) . '</p>';
-            $message .= '<p style="font-size: 0.8em">* ' . sprintf( __( 'Use the %s or %s shortcode if you just want to display products or categories.', 'ecommerce-product-catalog' ), '<code>[[[show_products]]]</code>', '<code>[[[show_categories]]]</code>' ) . '</p>';
-            implecode_info( $message );
-            echo "<script>jQuery('.assign-listing-button').click(function() {" . $this->assing_listing_script( $page_id ) . "});</script>";
-        }
-    }
-
-    function assing_listing_script( $page_id ) {
-        return "var data = {
+            $message .= '<p style="font-size: 0.8em">* ' . sprintf( __( 'Use the %s or %s shortcode if you just want to display products or categories.', 'ecommerce-product-catalog' ), '<code>[[[show_products]]]</code>', '<code>[[[show_categories]]]</code>' ) . '</p>';
+            implecode_info( $message );
+            echo "<script>jQuery('.assign-listing-button').click(function() {" . $this->assing_listing_script( $page_id ) . "});</script>";
+        }
+    }
+
+    function assing_listing_script( $page_id ) {
+        return "var data = {
         'action': 'ic_assign_listing',
         'page_id': '" . $page_id . "',
@@ -738 +739 @@
         window.location.reload(false);
 });";
-    }
-
-    function assign_listing() {
-        if ( ! empty( $_POST['page_id'] ) ) {
-            $page_id = intval( $_POST['page_id'] );
-            if ( ! empty( $page_id ) && is_ic_shortcode_integration( $page_id ) ) {
-                update_option( 'product_archive_page_id', $page_id );
-                update_option( 'product_archive', $page_id );
-                permalink_options_update();
-            }
-        }
-        wp_die();
-    }
-
-    function shortcode_product_adder() {
-        $query = $this->get_pre_shortcode_query();
-        if ( is_ic_product_listing_enabled() && empty( $query ) ) {
-            $listing_id = intval( get_product_listing_id() );
-            $id         = 'product_listing';
-            if ( ! empty( $listing_id ) && $this->multiple_settings['product_listing_cats'] !== 'forced_cats_only' ) {
-                global $wp_query, $paged;
-                if ( empty( $paged ) ) {
-                    $page = 1;
-                } else {
-                    $page = $paged;
-                }
-                $wp_query = $query = new WP_Query( array( 'page_id' => $listing_id, 'paged' => $page ) );
-            }
-            $this->default_message();
-        }
-        $listing_status = ic_get_product_listing_status();
-        if ( empty( $id ) ) {
-            if ( is_archive() || is_search() || is_home_archive() || is_ic_product_listing( $query ) || is_ic_taxonomy_page( $query ) || is_ic_product_search( $query ) ) {
-                if ( ! is_ic_product_listing( $query ) || ( is_ic_product_listing( $query ) && ( $listing_status === 'publish' || current_user_can( 'edit_private_products' ) ) ) ) {
-                    $id = 'product_listing';
-                }
-            } else if ( is_ic_product_page() ) {
-                $id = 'product_page';
-            }
-        }
-        if ( empty( $id ) ) {
-            if ( is_admin() ) {
-                echo '<br>';
-            }
-
-            return;
-        }
-        $class_exists = ic_get_global( 'ic_post_class_exists' );
-        if ( is_ic_admin() ) {
-            $class_exists = true;
-        }
-        if ( $class_exists === false ) {
-            ?>
+    }
+
+    function assign_listing() {
+        if ( ! empty( $_POST['page_id'] ) ) {
+            $page_id = intval( $_POST['page_id'] );
+            if ( ! empty( $page_id ) && is_ic_shortcode_integration( $page_id ) ) {
+                update_option( 'product_archive_page_id', $page_id );
+                update_option( 'product_archive', $page_id );
+                permalink_options_update();
+            }
+        }
+        wp_die();
+    }
+
+    function shortcode_product_adder() {
+        $query = $this->get_pre_shortcode_query();
+        if ( is_ic_product_listing_enabled() && empty( $query ) ) {
+            $listing_id = intval( get_product_listing_id() );
+            $id         = 'product_listing';
+            if ( ! empty( $listing_id ) && $this->multiple_settings['product_listing_cats'] !== 'forced_cats_only' ) {
+                global $wp_query, $paged;
+                if ( empty( $paged ) ) {
+                    $page = 1;
+                } else {
+                    $page = $paged;
+                }
+                $wp_query = $query = new WP_Query( array( 'page_id' => $listing_id, 'paged' => $page ) );
+            }
+            $this->default_message();
+        }
+        $listing_status = ic_get_product_listing_status();
+        if ( empty( $id ) ) {
+            if ( is_archive() || is_search() || is_home_archive() || is_ic_product_listing( $query ) || is_ic_taxonomy_page( $query ) || is_ic_product_search( $query ) ) {
+                if ( ! is_ic_product_listing( $query ) || ( is_ic_product_listing( $query ) && ( $listing_status === 'publish' || current_user_can( 'edit_private_products' ) ) ) ) {
+                    $id = 'product_listing';
+                }
+            } else if ( is_ic_product_page() ) {
+                $id = 'product_page';
+            }
+        }
+        if ( empty( $id ) ) {
+            if ( is_admin() ) {
+                echo '<br>';
+            }
+
+            return;
+        }
+        $class_exists = ic_get_global( 'ic_post_class_exists' );
+        if ( is_ic_admin() ) {
+            $class_exists = true;
+        }
+        if ( $class_exists === false ) {
+            ?>
             <div id="<?php echo $id ?>" <?php post_class() ?>>
-            <?php
-        }
-        //echo '<div class="ic-catalog-container alignwide">';
-        echo '<div class="ic-catalog-container">';
-        if ( $id === 'product_listing' ) {
-            $this->product_listing();
-        } else {
-            $this->product_page();
-        }
-        echo '</div>';
-
-        if ( $class_exists === false ) {
-            ?>
+            <?php
+        }
+        //echo '<div class="ic-catalog-container alignwide">';
+        echo '<div class="ic-catalog-container">';
+        if ( $id === 'product_listing' ) {
+            $this->product_listing();
+        } else {
+            $this->product_page();
+        }
+        echo '</div>';
+
+        if ( $class_exists === false ) {
+            ?>
             </div>
-            <?php
-        }
-    }
-
-    function product_page() {
-        do_action( 'before_product_page' );
-        $path = $this->get_custom_product_page_path();
-        if ( file_exists( $path ) ) {
-            ob_start();
-            include apply_filters( 'content_product_adder_path', $path );
-            $product_page = ob_get_clean();
-            echo do_shortcode( $product_page );
-        } else {
-            include apply_filters( 'content_product_adder_path', AL_BASE_TEMPLATES_PATH . '/templates/full/shortcode-product-page.php' );
-        }
-        do_action( 'after_product_page' );
-    }
-
-    function get_custom_product_page_path() {
-        $folder = get_custom_templates_folder();
-
-        return $folder . 'shortcode-product-page.php';
-    }
-
-    function product_listing() {
-        if ( ! empty( $this->shortcode_listing_generated ) ) {
-            return;
-        }
-        if ( empty( $this->multiple_settings ) ) {
-            $this->multiple_settings = get_multiple_settings();
-        }
-        $archive_template = get_product_listing_template();
-        do_action( 'product_listing_begin', $this->multiple_settings );
-        do_action( 'before_product_archive' );
-        do_action( 'before_product_listing_entry' );
-
-        do_action( 'product_listing_entry_inside', $archive_template, $this->multiple_settings );
-
-        do_action( 'product_listing_end', $archive_template, $this->multiple_settings );
-        do_action( 'after_product_archive' );
-        $this->shortcode_listing_generated = 1;
-    }
-
-    function catalog_query_force( $return = null ) {
-        return $this->catalog_query( $return, true );
-    }
-
-    function catalog_query( $return = null, $force = false ) {
-        if ( is_ic_shortcode_integration() && ( $this->status == 'page' || $force ) && is_ic_catalog_page() ) {
-            $pre_query   = $this->get_pre_shortcode_query();
-            $check_query = null;
-            if ( $pre_query !== false ) {
-                $check_query = $pre_query;
-            }
-            if ( is_ic_product_listing( $check_query ) && ! $this->no_page_id() ) {
-                return $return;
-            }
-
-            $this->status = 'catalog';
-            global $wp_query, $wp_the_query, $post;
-            $pre_post = $this->get_pre_shortcode_post();
-            if ( empty( $pre_query ) || empty( $pre_post ) ) {
-                return;
-            }
-            $wp_query = $pre_query;
+            <?php
+        }
+    }
+
+    function product_page() {
+        do_action( 'before_product_page' );
+        $path = $this->get_custom_product_page_path();
+        if ( file_exists( $path ) ) {
+            ob_start();
+            include apply_filters( 'content_product_adder_path', $path );
+            $product_page = ob_get_clean();
+            echo do_shortcode( $product_page );
+        } else {
+            include apply_filters( 'content_product_adder_path', AL_BASE_TEMPLATES_PATH . '/templates/full/shortcode-product-page.php' );
+        }
+        do_action( 'after_product_page' );
+    }
+
+    function get_custom_product_page_path() {
+        $folder = get_custom_templates_folder();
+
+        return $folder . 'shortcode-product-page.php';
+    }
+
+    function product_listing() {
+        if ( ! empty( $this->shortcode_listing_generated ) ) {
+            return;
+        }
+        if ( empty( $this->multiple_settings ) ) {
+            $this->multiple_settings = get_multiple_settings();
+        }
+        $archive_template = get_product_listing_template();
+        do_action( 'product_listing_begin', $this->multiple_settings );
+        do_action( 'before_product_archive' );
+        do_action( 'before_product_listing_entry' );
+
+        do_action( 'product_listing_entry_inside', $archive_template, $this->multiple_settings );
+
+        do_action( 'product_listing_end', $archive_template, $this->multiple_settings );
+        do_action( 'after_product_archive' );
+        $this->shortcode_listing_generated = 1;
+    }
+
+    function catalog_query_force( $return = null ) {
+        return $this->catalog_query( $return, true );
+    }
+
+    function catalog_query( $return = null, $force = false ) {
+        if ( is_ic_shortcode_integration() && ( $this->status == 'page' || $force ) && is_ic_catalog_page() ) {
+            $pre_query   = $this->get_pre_shortcode_query();
+            $check_query = null;
+            if ( $pre_query !== false ) {
+                $check_query = $pre_query;
+            }
+            if ( is_ic_product_listing( $check_query ) && ! $this->no_page_id() ) {
+                return $return;
+            }
+
+            $this->status = 'catalog';
+            global $wp_query, $wp_the_query, $post;
+            $pre_post = $this->get_pre_shortcode_post();
+            if ( empty( $pre_query ) || empty( $pre_post ) ) {
+                return;
+            }
+            $wp_query = $pre_query;
 //          if ( !$this->ended_query() ) {
-            $wp_the_query = $pre_query;
+            $wp_the_query = $pre_query;
 //          }
 
-            if ( ( is_ic_product_page() || is_ic_taxonomy_page() ) && ( ( ! is_ic_taxonomy_page() && empty( $this->settings['show_everywhere'] ) ) || $force || $this->is_inside_shortcode() ) ) { // added show everywhere check to keep Elementor HTML output
-                $post = $pre_post;
-            }
-
-            if ( empty( $wp_query->posts ) && is_ic_only_main_cats() ) {
-                $listing_id = intval( get_product_listing_id() );
-                if ( ! empty( $listing_id ) ) {
-                    $post               = $this->listing_post();
-                    $wp_query->posts    = array();
-                    $wp_query->posts[0] = $post;
-                }
-                $wp_query->post_count = 1;
-                add_action( 'shortcode_catalog_init', array( $this, 'clear_posts' ) );
-            }
-            if ( is_ic_product_page() ) {
-                $wp_query->is_page = true;
-            }
-
-            /*
-              $wp_query->is_page = true;
-
-              if ( !isset( $wp_query->queried_object->ID ) && $this->no_page_id() && !is_ic_taxonomy_page() ) {
-              $args = $this->empty_post_args();
-              foreach ( $args as $key => $value ) {
-              if ( !isset( $wp_query->queried_object->$key ) ) {
-              $wp_query->queried_object->$key = $value;
-              }
-              }
-              $wp_query->queried_object->ancestors = array();
-              }
-             *
-             */
-            do_action( 'ic_catalog_shortcode_catalog_query' );
-        }
-
-        return $return;
-    }
-
-    function fake_tax_first_post( $return = null ) {
-        if ( ! is_ic_shortcode_integration() || ( is_ic_product_listing() && ! $this->no_page_id() ) ) {
-            return $return;
-        }
-        global $wp_query;
-        if ( ! empty( $wp_query->queried_object->name ) || is_ic_taxonomy_page( $wp_query ) ) {
+            if ( ( is_ic_product_page() || is_ic_taxonomy_page() ) && ( ( ! is_ic_taxonomy_page() && empty( $this->settings['show_everywhere'] ) ) || $force || $this->is_inside_shortcode() ) ) { // added show everywhere check to keep Elementor HTML output
+                $post = $pre_post;
+            }
+
+            if ( empty( $wp_query->posts ) && is_ic_only_main_cats() ) {
+                $listing_id = intval( get_product_listing_id() );
+                if ( ! empty( $listing_id ) ) {
+                    $post               = $this->listing_post();
+                    $wp_query->posts    = array();
+                    $wp_query->posts[0] = $post;
+                }
+                $wp_query->post_count = 1;
+                add_action( 'shortcode_catalog_init', array( $this, 'clear_posts' ) );
+            }
+            if ( is_ic_product_page() ) {
+                $wp_query->is_page = true;
+            }
+
+            /*
+              $wp_query->is_page = true;
+
+              if ( !isset( $wp_query->queried_object->ID ) && $this->no_page_id() && !is_ic_taxonomy_page() ) {
+              $args = $this->empty_post_args();
+              foreach ( $args as $key => $value ) {
+              if ( !isset( $wp_query->queried_object->$key ) ) {
+              $wp_query->queried_object->$key = $value;
+              }
+              }
+              $wp_query->queried_object->ancestors = array();
+              }
+             *
+             */
+            do_action( 'ic_catalog_shortcode_catalog_query' );
+        }
+
+        return $return;
+    }
+
+    function fake_tax_first_post( $return = null ) {
+        if ( ! is_ic_shortcode_integration() || ( is_ic_product_listing() && ! $this->no_page_id() ) ) {
+            return $return;
+        }
+        global $wp_query;
+        if ( ! empty( $wp_query->queried_object->name ) || is_ic_taxonomy_page( $wp_query ) ) {
 //add_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
 //add_filter( 'the_title', array( $this, 'title' ), 99, 2 );
-        }
-
-        return $return;
-    }
-
-    function fake_listing_first_post( $return = null ) {
-        if ( ! is_ic_shortcode_integration() || ( is_ic_product_listing() && ! $this->no_page_id() ) ) {
-            return $return;
-        }
-        global $wp_query;
-        $listing_id = get_product_listing_id();
-        if ( ( ! empty( $wp_query->queried_object->ID ) && $wp_query->queried_object->ID == $listing_id ) || is_ic_product_listing( $wp_query ) ) {
-            add_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
-        }
-
-        return $return;
-    }
-
-    function fake_post_title( $title, $id = null ) {
-        if ( ! empty( $id ) ) {
-            global $wp_query;
-            $post       = get_post();
-            $listing_id = get_product_listing_id();
-            if ( is_ic_product_listing( $wp_query ) ) {
-                remove_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
-                $title = get_product_listing_title();
-            } else if ( ( $post->ID == $id && $listing_id != $id ) || is_ic_taxonomy_page( $wp_query ) ) {
+        }
+
+        return $return;
+    }
+
+    function fake_listing_first_post( $return = null ) {
+        if ( ! is_ic_shortcode_integration() || ( is_ic_product_listing() && ! $this->no_page_id() ) ) {
+            return $return;
+        }
+        global $wp_query;
+        $listing_id = get_product_listing_id();
+        if ( ( ! empty( $wp_query->queried_object->ID ) && $wp_query->queried_object->ID == $listing_id ) || is_ic_product_listing( $wp_query ) ) {
+            add_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
+        }
+
+        return $return;
+    }
+
+    function fake_post_title( $title, $id = null ) {
+        if ( ! empty( $id ) ) {
+            global $wp_query;
+            $post       = get_post();
+            $listing_id = get_product_listing_id();
+            if ( is_ic_product_listing( $wp_query ) ) {
+                remove_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
+                $title = get_product_listing_title();
+            } else if ( ( $post->ID == $id && $listing_id != $id ) || is_ic_taxonomy_page( $wp_query ) ) {
 //remove_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
-                if ( ! empty( $wp_query->queried_object->name ) ) {
-                    $title = get_product_tax_title( $wp_query->queried_object->name );
-                }
-            }
-        }
-
-        return $title;
-    }
-
-    function product_page_title( $title ) {
-        if ( is_ic_product_page() ) {
-            return get_product_name();
-        } else if ( is_ic_taxonomy_page() ) {
-            $this->catalog_query();
-
-            return get_product_tax_title( $title );
-        }
-
-        return $title;
-    }
-
-    function title( $title, $id = null ) {
-        $listing_id = get_product_listing_id();
-        if ( ! is_admin() && is_ic_catalog_page() && ! is_ic_product_page() && ! in_the_ic_loop() && ! is_filter_bar() && ( empty( $id ) || ( get_quasi_post_type( get_post_type( $id ) ) == 'al_product' ) ) || $listing_id == $id ) {
-            if ( is_ic_product_page() ) {
-                return get_product_name();
-            } else if ( is_ic_taxonomy_page() && ( empty( $id ) || ! is_ic_product( $id ) ) ) {
-                $this->catalog_query();
-
-                return get_product_tax_title( $title );
-            }
-        }
-
-        return $title;
-    }
-
-    function remove_overwrite_filters( $content = null ) {
-        remove_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
-
-        return $content;
-    }
-
-    function clear_posts() {
-        if ( is_ic_only_main_cats() ) {
-            global $wp_query;
-            if ( $wp_query->post_count == 1 ) {
-                $wp_query->post_count = 0;
-                $wp_query->posts      = array();
-            }
-        }
-    }
-
-    function end_query() {
-        if ( ( is_ic_product_listing() && ! $this->no_page_id() ) || ! is_ic_catalog_page() ) {
-            return;
-        }
+                if ( ! empty( $wp_query->queried_object->name ) ) {
+                    $title = get_product_tax_title( $wp_query->queried_object->name );
+                }
+            }
+        }
+
+        return $title;
+    }
+
+    function product_page_title( $title ) {
+        if ( is_ic_product_page() ) {
+            return get_product_name();
+        } else if ( is_ic_taxonomy_page() ) {
+            $this->catalog_query();
+
+            return get_product_tax_title( $title );
+        }
+
+        return $title;
+    }
+
+    function title( $title, $id = null ) {
+        $listing_id = get_product_listing_id();
+        if ( ! is_admin() && is_ic_catalog_page() && ! is_ic_product_page() && ! in_the_ic_loop() && ! is_filter_bar() && ( empty( $id ) || ( get_quasi_post_type( get_post_type( $id ) ) == 'al_product' ) ) || $listing_id == $id ) {
+            if ( is_ic_product_page() ) {
+                return get_product_name();
+            } else if ( is_ic_taxonomy_page() && ( empty( $id ) || ! is_ic_product( $id ) ) ) {
+                $this->catalog_query();
+
+                return get_product_tax_title( $title );
+            }
+        }
+
+        return $title;
+    }
+
+    function remove_overwrite_filters( $content = null ) {
+        remove_filter( 'the_title', array( $this, 'fake_post_title' ), 10, 2 );
+
+        return $content;
+    }
+
+    function clear_posts() {
+        if ( is_ic_only_main_cats() ) {
+            global $wp_query;
+            if ( $wp_query->post_count == 1 ) {
+                $wp_query->post_count = 0;
+                $wp_query->posts      = array();
+            }
+        }
+    }
+
+    function end_query() {
+        if ( ( is_ic_product_listing() && ! $this->no_page_id() ) || ! is_ic_catalog_page() ) {
+            return;
+        }
 //add_filter( 'the_content', array( $this, 'clear' ) );
-        global $wp_query, $wp_the_query, $ic_catalog_shortcode_query_ended;
-        if ( is_ic_taxonomy_page() || is_ic_product_search() ) {
-            $wp_query     = $this->main_listing_query();
-            $wp_the_query = $wp_query;
-        }
-
-        if ( ! empty( $wp_query->post ) ) {
-            global $post;
-            $post = $wp_query->post;
-        }
-
-        if ( ! empty( $wp_query->post_count ) ) {
-            $wp_query->post_count = 0;
-        }
-        if ( ! empty( $wp_query->found_posts ) ) {
-            $wp_query->found_posts = 0;
-        }
-        $wp_query->posts = array();
-        if ( is_ic_product_listing() && $this->no_page_id() ) {
-            $wp_query->is_archive = false;
-        }
-        $this->status = 'page';
-
-        ic_save_global( 'in_the_loop', 0 );
-        remove_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
-        remove_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99 );
-        remove_filter( 'the_content', array( $this, 'catalog_query' ), - 999 );
-        remove_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
-        remove_filter( 'the_content', array( $this, 'the_content_filter' ), - 999 );
-        add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
-        //remove_all_actions( 'the_content', 10 );
-        //remove_all_filters( 'the_content', 10 );
-        $ic_catalog_shortcode_query_ended = 1;
-    }
-
-    function ended_query() {
-        global $ic_catalog_shortcode_query_ended;
-        if ( ! empty( $ic_catalog_shortcode_query_ended ) ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function main_listing_query() {
-        $listing_query = ic_get_global( 'ic_main_listing_query' );
-        if ( $listing_query ) {
-            return $listing_query;
-        }
-        $args          = array( 'pagename' => $this->get_listing_slug() );
-        $listing_query = new WP_Query( $args );
-        ic_save_global( 'ic_main_listing_query', $listing_query );
-
-        return $listing_query;
-    }
-
-    function break_query() {
-        global $wp_query;
-        if ( ! empty( $this->after_header ) && ! empty( $this->loop_started ) && ! empty( $wp_query->query['pagename'] ) ) {
-            $wp_query->current_post = 0;
-            remove_action( 'get_template_part', array( $this, 'overwrite_query' ), 99, 0 );
-        }
-    }
-
-    function overwrite_query( $return = null ) {
-        if ( $this->status == 'catalog' && is_ic_shortcode_integration() && is_ic_catalog_page() && ( ! is_ic_product_listing() || $this->no_page_id() ) ) {
-            $this->set_post_type();
-            $this->status = 'page';
-            $this->get_pre_shortcode_query();
-            $this->get_pre_shortcode_post();
-            $this->page_query();
-            if ( isset( $return->post ) ) {
-                global $wp_query;
-                $return = $wp_query;
-            }
-        }
-
-        return $return;
-    }
-
-    function set_post_type() {
-        add_filter( 'current_product_post_type', array( $this, 'post_type' ) );
-        $current_post_type = get_post_type();
-        if ( is_ic_catalog_post_type( $current_post_type ) && empty( $this->post_type ) ) {
-            $this->post_type = $current_post_type;
-        }
-    }
-
-    function post_type( $post_type = null ) {
-        if ( ! empty( $this->post_type ) ) {
-            $post_type = $this->post_type;
-        }
-
-        return $post_type;
-    }
-
-    function get_pre_shortcode_query() {
-        if ( is_ic_catalog_page() && is_ic_shortcode_integration() ) {
-            $pre_query = ic_get_global( 'pre_shortcode_query' );
-            if ( $pre_query === false ) {
-                do_action( 'shortcode_catalog_query_first_save', $GLOBALS['wp_query'] );
-                ic_save_global( 'pre_shortcode_query', $GLOBALS['wp_query'] );
-                ic_set_catalog_query();
-
-                return $GLOBALS['wp_query'];
-            }
-
-            return $pre_query;
-        }
-
-        return false;
-    }
-
-    function main_listing_content() {
-        $listing_id = intval( get_product_listing_id() );
-        if ( ! empty( $listing_id ) ) {
-            $post = $this->listing_post();
-            if ( isset( $post->post_content ) ) {
-                return $post->post_content;
-            }
-        }
-
-        return '';
-    }
-
-    function has_listing_shortcode() {
-        return ic_has_listing_shortcode();
-    }
-
-    function get_pre_shortcode_post() {
-        if ( is_ic_catalog_page() && is_ic_shortcode_integration() ) {
-            $pre_post = ic_get_global( 'pre_shortcode_post' );
-            if ( ! $pre_post ) {
-                if ( ( is_ic_taxonomy_page() || is_ic_product_page() ) && isset( $GLOBALS['post']->post_content ) ) {
-                    $content = $this->main_listing_content();
-                    if ( ! empty( $content ) ) {
-                        //$listing_id = intval( get_product_listing_id() );
-                        //if ( !empty( $listing_id ) && ic_has_page_catalog_shortcode( get_post( $listing_id ) ) ) {
-                        $GLOBALS['post']->post_content = $content;
-                        //}
-                    }
-                }
-                do_action( 'shortcode_catalog_post_first_save', $GLOBALS['post'] );
-                ic_save_global( 'pre_shortcode_post', $GLOBALS['post'] );
-
-                return $GLOBALS['post'];
-            }
-
-            return $pre_post;
-        }
-
-        return false;
-    }
-
-    function listing_post() {
-        $listing_id = get_product_listing_id();
-        if ( $this->no_page_id() ) {
-            $listing_post = $this->empty_post();
-        } else {
-            $listing_post = get_post( $listing_id );
-        }
-        $pre_post = $this->get_pre_shortcode_query();
-        if ( ! is_ic_product_listing( $pre_post ) || $this->no_page_id() ) {
-            $listing_post->post_content = $this->clear_known( $listing_post->post_content );
-            if ( ! ic_has_page_catalog_shortcode( $listing_post ) ) {
-                $listing_post->post_content .= ic_catalog_shortcode();
-            }
-        }
-
-        return $listing_post;
-    }
-
-    function no_page_id() {
-        $listing_id = intval( get_product_listing_id() );
-        if ( empty( $listing_id ) ) {
-            return true;
-        }
-        $listing_post = get_post( $listing_id );
-        if ( empty( $listing_post ) ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function empty_post_args() {
-        $single_names = get_catalog_names();
-        $args         = array(
-            'ID'                    => 0,
-            'post_status'           => 'publish',
-            'post_author'           => '',
-            'post_parent'           => 0,
-            'post_type'             => 'page',
-            'post_date'             => '',
-            'post_date_gmt'         => '',
-            'post_modified'         => '',
-            'post_modified_gmt'     => '',
-            'post_content'          => '',
-            'post_title'            => $single_names['plural'],
-            'post_excerpt'          => '',
-            'post_content_filtered' => '',
-            'post_mime_type'        => '',
-            'post_password'         => '',
-            'post_name'             => sanitize_title( $single_names['plural'] ),
-            'guid'                  => '',
-            'menu_order'            => 0,
-            'pinged'                => '',
-            'to_ping'               => '',
-            'ping_status'           => '',
-            'comment_status'        => 'closed',
-            'comment_count'         => 0,
-            'filter'                => 'raw',
-        );
-
-        return $args;
-    }
-
-    function empty_post() {
-        $args = $this->empty_post_args();
-        $post = new WP_Post( (object) $args );
-
-        return $post;
-    }
-
-    function page_query( $return = null ) {
-        if ( ! is_admin() && is_ic_catalog_page() && is_ic_shortcode_integration() ) {
-            global $wp_query, $wp_the_query, $post;
-            $listing_slug = $this->get_listing_slug();
-            if ( ! empty( $wp_query->query['pagename'] ) && $wp_query->query['pagename'] === $listing_slug ) {
-                return $return;
-            }
-            $new_query = ic_get_global( 'ic_shortcode_new_query' );
-            $new_post  = ic_get_global( 'ic_shortcode_new_post' );
-            if ( $new_query && $new_post ) {
-                $wp_query     = $new_query;
-                $wp_the_query = $wp_query;
-                $post         = $new_post;
-                setup_postdata( $post );
-
-                return $return;
-            }
+        global $wp_query, $wp_the_query, $ic_catalog_shortcode_query_ended;
+        if ( is_ic_taxonomy_page() || is_ic_product_search() ) {
+            $wp_query     = $this->main_listing_query();
+            $wp_the_query = $wp_query;
+        }
+
+        if ( ! empty( $wp_query->post ) ) {
+            global $post;
+            $post = $wp_query->post;
+        }
+
+        if ( ! empty( $wp_query->post_count ) ) {
+            $wp_query->post_count = 0;
+        }
+        if ( ! empty( $wp_query->found_posts ) ) {
+            $wp_query->found_posts = 0;
+        }
+        $wp_query->posts = array();
+        if ( is_ic_product_listing() && $this->no_page_id() ) {
+            $wp_query->is_archive = false;
+        }
+        $this->status = 'page';
+
+        ic_save_global( 'in_the_loop', 0 );
+        remove_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
+        remove_filter( 'the_content', array( $this, 'auto_add_shortcode' ), 99 );
+        remove_filter( 'the_content', array( $this, 'catalog_query' ), - 999 );
+        remove_filter( 'the_content', array( $this, 'overwrite_query' ), 999 );
+        remove_filter( 'the_content', array( $this, 'the_content_filter' ), - 999 );
+        add_filter( 'get_post_metadata', array( $this, 'listing_metadata' ), 10, 4 );
+        //remove_all_actions( 'the_content', 10 );
+        //remove_all_filters( 'the_content', 10 );
+        $ic_catalog_shortcode_query_ended = 1;
+    }
+
+    function ended_query() {
+        global $ic_catalog_shortcode_query_ended;
+        if ( ! empty( $ic_catalog_shortcode_query_ended ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function main_listing_query() {
+        $listing_query = ic_get_global( 'ic_main_listing_query' );
+        if ( $listing_query ) {
+            return $listing_query;
+        }
+        $args          = array( 'pagename' => $this->get_listing_slug() );
+        $listing_query = new WP_Query( $args );
+        ic_save_global( 'ic_main_listing_query', $listing_query );
+
+        return $listing_query;
+    }
+
+    function break_query() {
+        global $wp_query;
+        if ( ! empty( $this->after_header ) && ! empty( $this->loop_started ) && ! empty( $wp_query->query['pagename'] ) ) {
+            $wp_query->current_post = 0;
+            remove_action( 'get_template_part', array( $this, 'overwrite_query' ), 99, 0 );
+        }
+    }
+
+    function overwrite_query( $return = null ) {
+        if ( $this->status == 'catalog' && is_ic_shortcode_integration() && is_ic_catalog_page() && ( ! is_ic_product_listing() || $this->no_page_id() ) ) {
+            $this->set_post_type();
+            $this->status = 'page';
+            $this->get_pre_shortcode_query();
+            $this->get_pre_shortcode_post();
+            $this->page_query();
+            if ( isset( $return->post ) ) {
+                global $wp_query;
+                $return = $wp_query;
+            }
+        }
+
+        return $return;
+    }
+
+    function set_post_type() {
+        add_filter( 'current_product_post_type', array( $this, 'post_type' ) );
+        $current_post_type = get_post_type();
+        if ( is_ic_catalog_post_type( $current_post_type ) && empty( $this->post_type ) ) {
+            $this->post_type = $current_post_type;
+        }
+    }
+
+    function post_type( $post_type = null ) {
+        if ( ! empty( $this->post_type ) ) {
+            $post_type = $this->post_type;
+        }
+
+        return $post_type;
+    }
+
+    function get_pre_shortcode_query() {
+        if ( is_ic_catalog_page() && is_ic_shortcode_integration() ) {
+            $pre_query = ic_get_global( 'pre_shortcode_query' );
+            if ( $pre_query === false ) {
+                do_action( 'shortcode_catalog_query_first_save', $GLOBALS['wp_query'] );
+                ic_save_global( 'pre_shortcode_query', $GLOBALS['wp_query'] );
+                ic_set_catalog_query();
+
+                return $GLOBALS['wp_query'];
+            }
+
+            return $pre_query;
+        }
+
+        return false;
+    }
+
+    function main_listing_content() {
+        $listing_id = intval( get_product_listing_id() );
+        if ( ! empty( $listing_id ) ) {
+            $post = $this->listing_post();
+            if ( isset( $post->post_content ) ) {
+                return $post->post_content;
+            }
+        }
+
+        return '';
+    }
+
+    function has_listing_shortcode() {
+        return ic_has_listing_shortcode();
+    }
+
+    function get_pre_shortcode_post() {
+        if ( is_ic_catalog_page() && is_ic_shortcode_integration() ) {
+            $pre_post = ic_get_global( 'pre_shortcode_post' );
+            if ( ! $pre_post ) {
+                if ( ( is_ic_taxonomy_page() || is_ic_product_page() ) && isset( $GLOBALS['post']->post_content ) ) {
+                    $content = $this->main_listing_content();
+                    if ( ! empty( $content ) ) {
+                        //$listing_id = intval( get_product_listing_id() );
+                        //if ( !empty( $listing_id ) && ic_has_page_catalog_shortcode( get_post( $listing_id ) ) ) {
+                        $GLOBALS['post']->post_content = $content;
+                        //}
+                    }
+                }
+                do_action( 'shortcode_catalog_post_first_save', $GLOBALS['post'] );
+                ic_save_global( 'pre_shortcode_post', $GLOBALS['post'] );
+
+                return $GLOBALS['post'];
+            }
+
+            return $pre_post;
+        }
+
+        return false;
+    }
+
+    function listing_post() {
+        $listing_id = get_product_listing_id();
+        if ( $this->no_page_id() ) {
+            $listing_post = $this->empty_post();
+        } else {
+            $listing_post = get_post( $listing_id );
+        }
+        $pre_post = $this->get_pre_shortcode_query();
+        if ( ! is_ic_product_listing( $pre_post ) || $this->no_page_id() ) {
+            $listing_post->post_content = $this->clear_known( $listing_post->post_content );
+            if ( ! ic_has_page_catalog_shortcode( $listing_post ) ) {
+                $listing_post->post_content .= ic_catalog_shortcode();
+            }
+        }
+
+        return $listing_post;
+    }
+
+    function no_page_id() {
+        $listing_id = intval( get_product_listing_id() );
+        if ( empty( $listing_id ) ) {
+            return true;
+        }
+        $listing_post = get_post( $listing_id );
+        if ( empty( $listing_post ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function empty_post_args() {
+        $single_names = get_catalog_names();
+        $args         = array(
+                'ID'                    => 0,
+                'post_status'           => 'publish',
+                'post_author'           => '',
+                'post_parent'           => 0,
+                'post_type'             => 'page',
+                'post_date'             => '',
+                'post_date_gmt'         => '',
+                'post_modified'         => '',
+                'post_modified_gmt'     => '',
+                'post_content'          => '',
+                'post_title'            => $single_names['plural'],
+                'post_excerpt'          => '',
+                'post_content_filtered' => '',
+                'post_mime_type'        => '',
+                'post_password'         => '',
+                'post_name'             => sanitize_title( $single_names['plural'] ),
+                'guid'                  => '',
+                'menu_order'            => 0,
+                'pinged'                => '',
+                'to_ping'               => '',
+                'ping_status'           => '',
+                'comment_status'        => 'closed',
+                'comment_count'         => 0,
+                'filter'                => 'raw',
+        );
+
+        return $args;
+    }
+
+    function empty_post() {
+        $args = $this->empty_post_args();
+        $post = new WP_Post( (object) $args );
+
+        return $post;
+    }
+
+    function page_query( $return = null ) {
+        if ( ! is_admin() && is_ic_catalog_page() && is_ic_shortcode_integration() ) {
+            global $wp_query, $wp_the_query, $post;
+            $listing_slug = $this->get_listing_slug();
+            if ( ! empty( $wp_query->query['pagename'] ) && $wp_query->query['pagename'] === $listing_slug ) {
+                return $return;
+            }
+            $new_query = ic_get_global( 'ic_shortcode_new_query' );
+            $new_post  = ic_get_global( 'ic_shortcode_new_post' );
+            if ( $new_query && $new_post ) {
+                $wp_query     = $new_query;
+                $wp_the_query = $wp_query;
+                $post         = $new_post;
+                setup_postdata( $post );
+
+                return $return;
+            }
 
 //query_posts( $args );
-            $wp_query     = $this->main_listing_query();
-            $listing_post = $this->listing_post();
-            $post         = $listing_post;
+            $wp_query     = $this->main_listing_query();
+            $listing_post = $this->listing_post();
+            $post         = $listing_post;
 
 //if ( !ic_has_page_catalog_shortcode( $post ) ) {
 //$post->post_content .= apply_filters( 'ic_catalog_default_listing_content', '[show_product_catalog]' );
 //}
-            $pre_post = $this->get_pre_shortcode_query();
+            $pre_post = $this->get_pre_shortcode_query();
 //generate_postdata( $listing_post );
-            $wp_query->post           = $post;
-            $wp_query->queried_object = $post;
-            $wp_query->posts          = array( 0 => $post );
+            $wp_query->post           = $post;
+            $wp_query->queried_object = $post;
+            $wp_query->posts          = array( 0 => $post );
 //if ( empty( $wp_query->post_count ) ) {
-            $wp_query->post_count = 1;
+            $wp_query->post_count = 1;
 //}
 //if ( empty( $wp_query->found_posts ) ) {
-            $wp_query->found_posts = 1;
+            $wp_query->found_posts = 1;
 //$wp_query->current_post    = 0;
 //$wp_query->in_the_loop     = true;
 //}
-            if ( is_ic_product_search( $pre_post ) ) {
-                $search_title = ic_get_search_page_title();
-                $this->title  = $search_title;
-            } else if ( ! empty( $pre_post->queried_object->labels->name ) ) {
-                $this->title = $pre_post->queried_object->labels->name;
-            } else if ( is_ic_product_listing( $pre_post ) ) {
-                $this->title = $listing_post->post_title;
+            if ( is_ic_product_search( $pre_post ) ) {
+                $search_title = ic_get_search_page_title();
+                $this->title  = $search_title;
+            } else if ( ! empty( $pre_post->queried_object->labels->name ) ) {
+                $this->title = $pre_post->queried_object->labels->name;
+            } else if ( is_ic_product_listing( $pre_post ) ) {
+                $this->title = $listing_post->post_title;
 //$wp_query->post->post_title            = $listing_post->post_title;
 //$wp_query->posts[ 0 ]->post_title  = $listing_post->post_title;
-            } else if ( ! empty( $pre_post->queried_object->name ) ) {
-                $tax_title         = get_product_tax_title( $pre_post->queried_object->name );
-                $this->title       = $tax_title;
-                $post->post_status = 'publish';
-            } else if ( ! empty( $pre_post->post->post_title ) ) {
-                $this->title       = $pre_post->post->post_title;
-                $post->post_status = $pre_post->post->post_status;
-            }
-            if ( ! empty( $this->title ) ) {
-                $post->post_title               = $this->title;
-                $wp_query->post->post_title     = $this->title;
-                $wp_query->posts[0]->post_title = $this->title;
-            }
-            global $wp_version;
-            if ( version_compare( $wp_version, 6.1, '>=' ) ) {
-                $wp_query->ic_main_page_query = 1;
-            }
-            $wp_the_query = $wp_query;
-            ic_save_global( 'ic_shortcode_new_query', $wp_query );
-            ic_save_global( 'ic_shortcode_new_post', $post );
-            add_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
-            setup_postdata( $post );
-        }
-
-        return $return;
-    }
-
-    function set_content( $content ) {
-        if ( empty( $this->loop_started ) ) {
-            return $content;
-        }
-        $listing_id = intval( get_product_listing_id() );
-        global $wp_query;
-        if ( empty( $listing_id ) || ( ! empty( $wp_query->queried_object->ID ) && $wp_query->queried_object->ID == $listing_id ) || is_ic_product_page() ) {
-            if ( is_ic_catalog_page() ) {
-                if ( ! $this->has_listing_shortcode() ) {
-                    $content = do_shortcode( '[show_product_catalog]' );
-                }
-            }
-
-            return $content;
-        }
-        $page  = $this->listing_post();
-        $readd = false;
-        if ( has_filter( 'the_content', array( $this, 'set_content' ) ) ) {
-            remove_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
-            $readd = true;
-        }
-        if ( ! ic_has_page_catalog_shortcode( $page ) ) {
-            if ( ! $this->has_listing_shortcode() ) {
-                $page->post_content = '';
-            } else {
-                $page->post_content = $this->clear_known( $page->post_content );
-            }
-            $page->post_content .= ic_catalog_shortcode();
-        }
+            } else if ( ! empty( $pre_post->queried_object->name ) ) {
+                $tax_title         = get_product_tax_title( $pre_post->queried_object->name );
+                $this->title       = $tax_title;
+                $post->post_status = 'publish';
+            } else if ( ! empty( $pre_post->post->post_title ) ) {
+                $this->title       = $pre_post->post->post_title;
+                $post->post_status = $pre_post->post->post_status;
+            }
+            if ( ! empty( $this->title ) ) {
+                $post->post_title               = $this->title;
+                $wp_query->post->post_title     = $this->title;
+                $wp_query->posts[0]->post_title = $this->title;
+            }
+            global $wp_version;
+            if ( version_compare( $wp_version, 6.1, '>=' ) ) {
+                $wp_query->ic_main_page_query = 1;
+            }
+            $wp_the_query = $wp_query;
+            ic_save_global( 'ic_shortcode_new_query', $wp_query );
+            ic_save_global( 'ic_shortcode_new_post', $post );
+            add_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
+            setup_postdata( $post );
+        }
+
+        return $return;
+    }
+
+    function set_content( $content ) {
+        if ( empty( $this->loop_started ) ) {
+            return $content;
+        }
+        $listing_id = intval( get_product_listing_id() );
+        global $wp_query;
+        if ( empty( $listing_id ) || ( ! empty( $wp_query->queried_object->ID ) && $wp_query->queried_object->ID == $listing_id ) || is_ic_product_page() ) {
+            if ( is_ic_catalog_page() ) {
+                if ( ! $this->has_listing_shortcode() ) {
+                    $content = do_shortcode( '[show_product_catalog]' );
+                }
+            }
+
+            return $content;
+        }
+        $page  = $this->listing_post();
+        $readd = false;
+        if ( has_filter( 'the_content', array( $this, 'set_content' ) ) ) {
+            remove_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
+            $readd = true;
+        }
+        if ( ! ic_has_page_catalog_shortcode( $page ) ) {
+            if ( ! $this->has_listing_shortcode() ) {
+                $page->post_content = '';
+            } else {
+                $page->post_content = $this->clear_known( $page->post_content );
+            }
+            $page->post_content .= ic_catalog_shortcode();
+        }
 //$content = apply_filters( 'the_content', $page->post_content );
 
-        if ( function_exists( 'do_blocks' ) ) {
-            add_filter( 'ic_catalog_shortcode_default_content', 'do_blocks' );
-        }
-        add_filter( 'ic_catalog_shortcode_default_content', 'wptexturize' );
-        add_filter( 'ic_catalog_shortcode_default_content', 'convert_smilies', 20 );
-        add_filter( 'ic_catalog_shortcode_default_content', 'wpautop' );
-        add_filter( 'ic_catalog_shortcode_default_content', 'shortcode_unautop' );
-        add_filter( 'ic_catalog_shortcode_default_content', 'prepend_attachment' );
-        if ( function_exists( 'wp_make_content_images_responsive' ) ) {
-            add_filter( 'ic_catalog_shortcode_default_content', 'wp_make_content_images_responsive' );
-        }
-        add_filter( 'ic_catalog_shortcode_default_content', 'do_shortcode', 11 );
-        $content = apply_filters( 'ic_catalog_shortcode_default_content', $page->post_content );
+        if ( function_exists( 'do_blocks' ) ) {
+            add_filter( 'ic_catalog_shortcode_default_content', 'do_blocks' );
+        }
+        add_filter( 'ic_catalog_shortcode_default_content', 'wptexturize' );
+        add_filter( 'ic_catalog_shortcode_default_content', 'convert_smilies', 20 );
+        add_filter( 'ic_catalog_shortcode_default_content', 'wpautop' );
+        add_filter( 'ic_catalog_shortcode_default_content', 'shortcode_unautop' );
+        add_filter( 'ic_catalog_shortcode_default_content', 'prepend_attachment' );
+        if ( function_exists( 'wp_make_content_images_responsive' ) ) {
+            add_filter( 'ic_catalog_shortcode_default_content', 'wp_make_content_images_responsive' );
+        }
+        add_filter( 'ic_catalog_shortcode_default_content', 'do_shortcode', 11 );
+        $content = apply_filters( 'ic_catalog_shortcode_default_content', $page->post_content );
 //$content = do_shortcode( '[show_product_catalog]' );
-        if ( ! $this->ended_query() ) {
-            add_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
-        }
-
-        return $content;
-    }
-
-    function clear() {
-        return '';
-    }
-
-    function get_listing_slug() {
-        $listing_id = intval( get_product_listing_id() );
-        if ( ! empty( $listing_id ) ) {
-            $post = get_post( $listing_id );
-            if ( ! empty( $post->post_name ) ) {
-                return $post->post_name;
-            }
-        }
-        if ( $this->no_page_id() ) {
-            return sanitize_title( get_catalog_names( 'plural' ) );
-        } else {
-            return false;
-        }
-    }
-
-    function setup_postdata() {
-        global $post, $wp_query;
-        if ( is_ic_catalog_page() ) {
-            if ( is_ic_product_listing() && ! $this->no_page_id() ) {
-                return;
-            }
-            if ( isset( $wp_query->queried_object->ID ) ) {
-                $product_id = $wp_query->queried_object->ID;
-                ic_set_product_id( $product_id );
-                $post = get_post( $product_id );
-
-                if ( empty( $post->post_content ) ) {
-                    $post->post_content = ' ';
-                }
-                setup_postdata( $post );
-            }
-        } else if ( ! is_ic_page() ) {
-            $listing_id = intval( get_product_listing_id() );
-            if ( ! empty( $listing_id ) ) {
-                $post     = $this->listing_post();
-                $wp_query = $this->main_listing_query();
-            }
-        }
-    }
-
-    function setup_loop() {
-        ic_save_global( 'in_the_loop', 1 );
-    }
-
-    function check_post_class( $class ) {
-        ic_save_global( 'ic_post_class_exists', 1 );
-        $class[] = 'page';
-        $class[] = 'type-page';
-        remove_filter( 'ic_catalog_body_class_start', array( $this, 'overwrite_query' ), 1 );
-        remove_filter( 'ic_catalog_single_body_class', array( $this, 'catalog_query' ), 99, 1 );
-        remove_filter( 'ic_catalog_tax_body_class', array( $this, 'catalog_query' ), 98, 1 );
-        remove_filter( 'ic_catalog_tax_body_class', array( $this, 'tax_body_class' ), 98, 1 );
-        remove_filter( 'ic_catalog_single_body_class', array( $this, 'single_body_class' ), 98, 1 );
-
-        return $class;
-    }
-
-    function tax_body_class( $body_class ) {
-        $key = array_search( 'archive', $body_class );
-        if ( $key !== false ) {
-            unset( $body_class[ $key ] );
-        }
-
-        return $body_class;
-    }
-
-    function single_body_class( $body_class ) {
-        $key = array_search( 'single', $body_class );
-        if ( $key !== false ) {
-            unset( $body_class[ $key ] );
-        }
-
-        return $body_class;
-    }
+        if ( ! $this->ended_query() ) {
+            add_filter( 'the_content', array( $this, 'set_content' ), 99999999 );
+        }
+
+        return $content;
+    }
+
+    function clear() {
+        return '';
+    }
+
+    function get_listing_slug() {
+        $listing_id = intval( get_product_listing_id() );
+        if ( ! empty( $listing_id ) ) {
+            $post = get_post( $listing_id );
+            if ( ! empty( $post->post_name ) ) {
+                return $post->post_name;
+            }
+        }
+        if ( $this->no_page_id() ) {
+            return sanitize_title( get_catalog_names( 'plural' ) );
+        } else {
+            return false;
+        }
+    }
+
+    function setup_postdata() {
+        global $post, $wp_query;
+        if ( is_ic_catalog_page() ) {
+            if ( is_ic_product_listing() && ! $this->no_page_id() ) {
+                return;
+            }
+            if ( isset( $wp_query->queried_object->ID ) ) {
+                $product_id = $wp_query->queried_object->ID;
+                ic_set_product_id( $product_id );
+                $post = get_post( $product_id );
+
+                if ( empty( $post->post_content ) ) {
+                    $post->post_content = ' ';
+                }
+                setup_postdata( $post );
+            }
+        } else if ( ! is_ic_page() ) {
+            $listing_id = intval( get_product_listing_id() );
+            if ( ! empty( $listing_id ) ) {
+                $post     = $this->listing_post();
+                $wp_query = $this->main_listing_query();
+            }
+        }
+    }
+
+    function setup_loop() {
+        ic_save_global( 'in_the_loop', 1 );
+    }
+
+    function check_post_class( $class ) {
+        ic_save_global( 'ic_post_class_exists', 1 );
+        $class[] = 'page';
+        $class[] = 'type-page';
+        remove_filter( 'ic_catalog_body_class_start', array( $this, 'overwrite_query' ), 1 );
+        remove_filter( 'ic_catalog_single_body_class', array( $this, 'catalog_query' ), 99, 1 );
+        remove_filter( 'ic_catalog_tax_body_class', array( $this, 'catalog_query' ), 98, 1 );
+        remove_filter( 'ic_catalog_tax_body_class', array( $this, 'tax_body_class' ), 98, 1 );
+        remove_filter( 'ic_catalog_single_body_class', array( $this, 'single_body_class' ), 98, 1 );
+
+        return $class;
+    }
+
+    function body_class( $class, $css_class = '' ) {
+        $this->catalog_query();
+        remove_filter( 'body_class', array( $this, 'body_class' ), 1, 2 );
+        $class = get_body_class( $css_class );
+        add_filter( 'body_class', array( $this, 'body_class' ), 1, 2 );
+        $this->overwrite_query();
+
+        return $class;
+    }
+
+    function tax_body_class( $body_class ) {
+        $key = array_search( 'archive', $body_class );
+        if ( $key !== false ) {
+            unset( $body_class[ $key ] );
+        }
+
+        return $body_class;
+    }
+
+    function single_body_class( $body_class ) {
+        $key = array_search( 'single', $body_class );
+        if ( $key !== false ) {
+            unset( $body_class[ $key ] );
+        }
+
+        return $body_class;
+    }
 
 }

ecommerce-product-catalog/trunk/templates/templates-functions.php

@@ -2 +2 @@
 
 if ( ! defined( 'ABSPATH' ) ) {
-    exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
@@ -21 +21 @@
  */
 function content_product_adder( $is_catalog = null ) {
-    if ( $is_catalog !== 'is_catalog' && ! is_ic_catalog_page() ) {
-        return;
-    }
-    echo '<div class="ic-catalog-container">';
-    if ( is_archive() || is_search() || is_home_archive() || is_ic_product_listing() ) {
-        do_action( 'before_product_archive' );
-        content_product_adder_archive();
-        do_action( 'after_product_archive' );
-    } else {
-        do_action( 'before_product_page' );
-        content_product_adder_single();
-        do_action( 'after_product_page' );
-    }
-    echo '</div>';
+    if ( $is_catalog !== 'is_catalog' && ! is_ic_catalog_page() ) {
+        return;
+    }
+    echo '<div class="ic-catalog-container">';
+    if ( is_archive() || is_search() || is_home_archive() || is_ic_product_listing() ) {
+        do_action( 'before_product_archive' );
+        content_product_adder_archive();
+        do_action( 'after_product_archive' );
+    } else {
+        do_action( 'before_product_page' );
+        content_product_adder_single();
+        do_action( 'after_product_page' );
+    }
+    echo '</div>';
 }
 
 function ic_redirect_to_same() {
-    $url = 'http';
-    if ( is_ssl() ) {
-        $url .= 's';
-    }
-    $url .= '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-    wp_redirect( esc_url_raw( $url ) );
-    exit;
+    $url = 'http';
+    if ( is_ssl() ) {
+        $url .= 's';
+    }
+    $url .= '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    wp_redirect( esc_url_raw( $url ) );
+    exit;
 }
 
 function content_product_adder_archive() {
-    $path = get_custom_product_listing_path();
-    if ( file_exists( $path ) ) {
-        ob_start();
-        include apply_filters( 'content_product_adder_archive_path', $path );
-        $product_listing = ob_get_clean();
-        echo do_shortcode( $product_listing );
-    } else {
-        include apply_filters( 'content_product_adder_archive_path', AL_BASE_TEMPLATES_PATH . '/templates/full/product-listing.php' );
-    }
+    $path = get_custom_product_listing_path();
+    if ( file_exists( $path ) ) {
+        ob_start();
+        include apply_filters( 'content_product_adder_archive_path', $path );
+        $product_listing = ob_get_clean();
+        echo do_shortcode( $product_listing );
+    } else {
+        include apply_filters( 'content_product_adder_archive_path', AL_BASE_TEMPLATES_PATH . '/templates/full/product-listing.php' );
+    }
 }
 
 function content_product_adder_single() {
-    add_action( 'product_page_inside', 'content_product_adder_single_content' );
-    $path = get_custom_product_page_path();
-    if ( file_exists( $path ) ) {
-        ob_start();
-        include apply_filters( 'content_product_adder_path', $path );
-        $product_page = ob_get_clean();
-        echo do_shortcode( $product_page );
-    } else {
-        include apply_filters( 'content_product_adder_path', AL_BASE_TEMPLATES_PATH . '/templates/full/product-page.php' );
-    }
+    add_action( 'product_page_inside', 'content_product_adder_single_content' );
+    $path = get_custom_product_page_path();
+    if ( file_exists( $path ) ) {
+        ob_start();
+        include apply_filters( 'content_product_adder_path', $path );
+        $product_page = ob_get_clean();
+        echo do_shortcode( $product_page );
+    } else {
+        include apply_filters( 'content_product_adder_path', AL_BASE_TEMPLATES_PATH . '/templates/full/product-page.php' );
+    }
 }
 
 function content_product_adder_single_content() {
-    $path = get_custom_product_page_inside_path();
-    if ( file_exists( $path ) ) {
-        ob_start();
-        include $path;
-        $product_page = ob_get_clean();
-        echo do_shortcode( $product_page );
-    } else {
-        include AL_BASE_TEMPLATES_PATH . '/templates/full/product-page-inside.php';
-    }
+    $path = get_custom_product_page_inside_path();
+    if ( file_exists( $path ) ) {
+        ob_start();
+        include $path;
+        $product_page = ob_get_clean();
+        echo do_shortcode( $product_page );
+    } else {
+        include AL_BASE_TEMPLATES_PATH . '/templates/full/product-page-inside.php';
+    }
 }
 
 function content_product_adder_archive_before() {
-    $page_id = apply_filters( 'before_archive_post_id', get_product_listing_id() );
-    $page    = empty( $page_id ) ? '' : get_post( $page_id );
-    if ( $page != '' && ! is_ic_shortcode_integration() ) {
-        if ( get_integration_type() != 'simple' ) {
-            if ( ic_has_page_catalog_shortcode( $page ) ) {
-                $page->post_content = str_replace( array(
-                    '<!-- wp:ic-epc/show-catalog /-->',
-                    '[show_product_catalog]'
-                ), '', $page->post_content );
-            }
-            $content = apply_filters( "the_content", $page->post_content );
-        } else {
-            $content = $page->post_content;
-        }
-    } else {
-        $content = '';
-    }
-
-    return '<div class="entry-summary">' . $content . '</div>';
+    $page_id = apply_filters( 'before_archive_post_id', get_product_listing_id() );
+    $page    = empty( $page_id ) ? '' : get_post( $page_id );
+    if ( $page != '' && ! is_ic_shortcode_integration() ) {
+        if ( get_integration_type() != 'simple' ) {
+            if ( ic_has_page_catalog_shortcode( $page ) ) {
+                $page->post_content = str_replace( array(
+                        '<!-- wp:ic-epc/show-catalog /-->',
+                        '[show_product_catalog]'
+                ), '', $page->post_content );
+            }
+            $content = apply_filters( "the_content", $page->post_content );
+        } else {
+            $content = $page->post_content;
+        }
+    } else {
+        $content = '';
+    }
+
+    return '<div class="entry-summary">' . $content . '</div>';
 }
 
 function content_product_adder_archive_before_title() {
-    $def_page_id   = get_product_listing_id();
-    $archive_names = get_archive_names();
-    $page_id       = apply_filters( 'before_archive_post_id', $def_page_id );
-    $page          = empty( $page_id ) ? '' : get_post( $page_id );
-    if ( $page == '' ) {
-        echo '<h1 class="entry-title">' . $archive_names['all_products'] . '</h1>';
-    } else {
-        echo '<h1 class="entry-title">' . $page->post_title . '</h1>';
-    }
+    $def_page_id   = get_product_listing_id();
+    $archive_names = get_archive_names();
+    $page_id       = apply_filters( 'before_archive_post_id', $def_page_id );
+    $page          = empty( $page_id ) ? '' : get_post( $page_id );
+    if ( $page == '' ) {
+        echo '<h1 class="entry-title">' . $archive_names['all_products'] . '</h1>';
+    } else {
+        echo '<h1 class="entry-title">' . $page->post_title . '</h1>';
+    }
 }
 
 function show_products_outside_loop( $atts, $content = '' ) {
-    global $shortcode_query, $product_sort, $archive_template, $shortcode_args;
-    ic_reset_listing_globals();
-    ic_enqueue_main_catalog_js_css();
-    ic_save_global( 'in_shortcode', 1, true );
-    $available_args   = apply_filters( 'show_products_shortcode_args', array(
-        'post_type'        => 'al_product',
-        'category'         => '',
-        'product'          => '',
-        'exclude'          => '',
-        'products_limit'   => 100,
-        'archive_template' => get_product_listing_template(),
-        'design_scheme'    => '',
-        'sort'             => 0,
-        'orderby'          => '',
-        'order'            => '',
-        'pagination'       => 0,
-        'page'             => '',
-        'per_row'          => '',
-        'empty'            => '',
-    ) );
-    $args             = shortcode_atts( $available_args, $atts );
-    $shortcode_args   = $args;
-    $category         = esc_html( $args['category'] );
-    $product          = esc_html( $args['product'] );
-    $exclude          = esc_html( $args['exclude'] );
-    $products_limit   = intval( $args['products_limit'] );
-    $archive_template = esc_attr( $args['archive_template'] );
-    $design_scheme    = esc_attr( $args['design_scheme'] );
-    $product_sort     = intval( $args['sort'] );
-    $per_row          = intval( $args['per_row'] );
-    $args['page']     = intval( $args['page'] );
-    if ( ! empty( $per_row ) ) {
-        ic_save_global( 'shortcode_per_row', $per_row, true );
-    }
-    $post_type = empty( $args['post_type'] ) ? 'al_product' : $args['post_type'];
-    if ( ! empty( $product ) ) {
-        $product_array = explode( ',', $product );
-        $query_param   = array(
-            'post_type'      => product_post_type_array(),
-            'post__in'       => $product_array,
-            'posts_per_page' => $products_limit,
-        );
-    } else if ( ! empty( $category ) ) {
-        $category_array = explode( ',', $category );
-        $field          = 'name';
-        if ( is_numeric( $category_array[0] ) ) {
-            $field = 'term_id';
-        }
-        $query_param = array(
-            'post_type'      => $post_type,
-            'tax_query'      => array(
-                array(
-                    'taxonomy' => 'al_product-cat',
-                    'field'    => $field,
-                    'terms'    => $category_array,
-                ),
-            ),
-            'posts_per_page' => $products_limit,
-        );
-    } else {
-        $query_param = array(
-            'post_type'      => $post_type,
-            'posts_per_page' => $products_limit,
-        );
-        if ( ! empty( $exclude ) ) {
-            $query_param['post__not_in'] = explode( ',', $exclude );
-        }
-    }
-    if ( $args['orderby'] == 'none' ) {
-        $args['orderby'] = 'post__in';
-    }
-    if ( ! empty( $args['orderby'] ) ) {
-        $query_param['orderby'] = esc_attr( $args['orderby'] );
-    }
-    if ( ! empty( $args['order'] ) ) {
-        $query_param['order'] = esc_attr( $args['order'] );
-    }
-    if ( ! empty( $args['pagination'] ) ) {
-
-        if ( get_query_var( 'paged' ) ) {
-            $paged = absint( get_query_var( 'paged' ) );
-        } elseif ( get_query_var( 'page' ) ) {
-            $paged = absint( get_query_var( 'page' ) );
-        } else if ( ! empty( $args['page'] ) ) {
-            $paged = $args['page'];
-        } else {
-            $paged = 1;
-        }
-        $query_param['paged'] = $paged;
-    }
-    $query_param = apply_filters( 'shortcode_query', $query_param, $args, $post_type, $products_limit );
-    remove_all_filters( 'pre_get_posts' );
-    $shortcode_query                            = new WP_Query( $query_param );
-    $shortcode_query->query['archive_template'] = $archive_template;
-    $i                                          = 0;
-    ob_start();
-    do_action( 'before_product_list', $archive_template );
-    do_action( 'before_shortcode_product_list', $shortcode_query, $args, $archive_template );
-    echo do_shortcode( $content );
-    $before = ob_get_contents();
-    ob_end_clean();
-    $products_listed = false;
-    $inside          = apply_filters( 'pre_show_products_outside_loop_inside', '', $shortcode_query );
-    if ( empty( $inside ) ) {
-        while ( $shortcode_query->have_posts() ) : $shortcode_query->the_post();
-            global $post;
-            ic_set_product_id( $post->ID );
-            $i ++;
-            $inside .= get_catalog_template( $archive_template, $post, $i, $design_scheme );
-            ic_reset_product_id();
-        endwhile;
-    }
-    if ( ! empty( $inside ) ) {
-        $products_listed = true;
-    }
-    $pagination = '';
-    if ( ! empty( $args['pagination'] ) ) {
-        ob_start();
-        product_archive_pagination( $shortcode_query );
-        $pagination = ob_get_clean();
-    }
-    if ( ! empty( $args['empty'] ) && ! $products_listed ) {
-        $inside .= wp_kses_post( $args['empty'] );
-    }
-    $inside = apply_filters( 'product_list_ready', $inside, $archive_template, $args );
-    wp_reset_postdata();
-    if ( ! empty( $inside ) ) {
-        $out_class = apply_filters( 'ic_show_products_container_class', 'product-list responsive ' . $archive_template . ' ' . product_list_class( $archive_template ), $args );
-        $out       = $before . '<div class="' . $out_class . '" ' . product_list_attr( $shortcode_query ) . '>' . $inside . '<div style="clear:both"></div></div>' . $pagination;
-    } else {
-        $out = '';
-    }
-    unset( $GLOBALS['shortcode_args'] );
-    unset( $GLOBALS['shortcode_query'] );
-    unset( $GLOBALS['archive_template'] );
-    unset( $GLOBALS['product_sort'] );
-    ic_delete_global( 'in_shortcode' );
-    //ic_delete_global( 'shortcode_per_row' );
-    reset_row_class();
-
-    return $out;
+    global $shortcode_query, $product_sort, $archive_template, $shortcode_args;
+    ic_reset_listing_globals();
+    ic_enqueue_main_catalog_js_css();
+    ic_save_global( 'in_shortcode', 1, true );
+    $available_args   = apply_filters( 'show_products_shortcode_args', array(
+            'post_type'        => 'al_product',
+            'category'         => '',
+            'product'          => '',
+            'exclude'          => '',
+            'products_limit'   => 100,
+            'archive_template' => get_product_listing_template(),
+            'design_scheme'    => '',
+            'sort'             => 0,
+            'orderby'          => '',
+            'order'            => '',
+            'pagination'       => 0,
+            'page'             => '',
+            'per_row'          => '',
+            'empty'            => '',
+    ) );
+    $args             = shortcode_atts( $available_args, $atts );
+    $shortcode_args   = $args;
+    $category         = esc_html( $args['category'] );
+    $product          = esc_html( $args['product'] );
+    $exclude          = esc_html( $args['exclude'] );
+    $products_limit   = intval( $args['products_limit'] );
+    $archive_template = esc_attr( $args['archive_template'] );
+    $design_scheme    = esc_attr( $args['design_scheme'] );
+    $product_sort     = intval( $args['sort'] );
+    $per_row          = intval( $args['per_row'] );
+    $args['page']     = intval( $args['page'] );
+    if ( ! empty( $per_row ) ) {
+        ic_save_global( 'shortcode_per_row', $per_row, true );
+    }
+    $post_type = empty( $args['post_type'] ) ? 'al_product' : $args['post_type'];
+    if ( ! empty( $product ) ) {
+        $product_array = explode( ',', $product );
+        $query_param   = array(
+                'post_type'      => product_post_type_array(),
+                'post__in'       => $product_array,
+                'posts_per_page' => $products_limit,
+        );
+    } else if ( ! empty( $category ) ) {
+        $category_array = explode( ',', $category );
+        $field          = 'name';
+        if ( is_numeric( $category_array[0] ) ) {
+            $field = 'term_id';
+        }
+        $query_param = array(
+                'post_type'      => $post_type,
+                'tax_query'      => array(
+                        array(
+                                'taxonomy' => 'al_product-cat',
+                                'field'    => $field,
+                                'terms'    => $category_array,
+                        ),
+                ),
+                'posts_per_page' => $products_limit,
+        );
+    } else {
+        $query_param = array(
+                'post_type'      => $post_type,
+                'posts_per_page' => $products_limit,
+        );
+        if ( ! empty( $exclude ) ) {
+            $query_param['post__not_in'] = explode( ',', $exclude );
+        }
+    }
+    if ( $args['orderby'] == 'none' ) {
+        $args['orderby'] = 'post__in';
+    }
+    if ( ! empty( $args['orderby'] ) ) {
+        $query_param['orderby'] = esc_attr( $args['orderby'] );
+    }
+    if ( ! empty( $args['order'] ) ) {
+        $query_param['order'] = esc_attr( $args['order'] );
+    }
+    if ( ! empty( $args['pagination'] ) ) {
+
+        if ( get_query_var( 'paged' ) ) {
+            $paged = absint( get_query_var( 'paged' ) );
+        } elseif ( get_query_var( 'page' ) ) {
+            $paged = absint( get_query_var( 'page' ) );
+        } else if ( ! empty( $args['page'] ) ) {
+            $paged = $args['page'];
+        } else {
+            $paged = 1;
+        }
+        $query_param['paged'] = $paged;
+    }
+    $query_param = apply_filters( 'shortcode_query', $query_param, $args, $post_type, $products_limit );
+    remove_all_filters( 'pre_get_posts' );
+    $shortcode_query                            = new WP_Query( $query_param );
+    $shortcode_query->query['archive_template'] = $archive_template;
+    $i                                          = 0;
+    ob_start();
+    do_action( 'before_product_list', $archive_template );
+    do_action( 'before_shortcode_product_list', $shortcode_query, $args, $archive_template );
+    echo do_shortcode( $content );
+    $before = ob_get_contents();
+    ob_end_clean();
+    $products_listed = false;
+    $inside          = apply_filters( 'pre_show_products_outside_loop_inside', '', $shortcode_query );
+    if ( empty( $inside ) ) {
+        while ( $shortcode_query->have_posts() ) : $shortcode_query->the_post();
+            global $post;
+            ic_set_product_id( $post->ID );
+            $i ++;
+            $inside .= get_catalog_template( $archive_template, $post, $i, $design_scheme );
+            ic_reset_product_id();
+        endwhile;
+    }
+    if ( ! empty( $inside ) ) {
+        $products_listed = true;
+    }
+    $pagination = '';
+    if ( ! empty( $args['pagination'] ) ) {
+        ob_start();
+        product_archive_pagination( $shortcode_query );
+        $pagination = ob_get_clean();
+    }
+    if ( ! empty( $args['empty'] ) && ! $products_listed ) {
+        $inside .= wp_kses_post( $args['empty'] );
+    }
+    $inside = apply_filters( 'product_list_ready', $inside, $archive_template, $args );
+    wp_reset_postdata();
+    if ( ! empty( $inside ) ) {
+        $out_class = apply_filters( 'ic_show_products_container_class', 'product-list responsive ' . $archive_template . ' ' . product_list_class( $archive_template ), $args );
+        $out       = $before . '<div class="' . $out_class . '" ' . product_list_attr( $shortcode_query ) . '>' . $inside . '<div style="clear:both"></div></div>' . $pagination;
+    } else {
+        $out = '';
+    }
+    unset( $GLOBALS['shortcode_args'] );
+    unset( $GLOBALS['shortcode_query'] );
+    unset( $GLOBALS['archive_template'] );
+    unset( $GLOBALS['product_sort'] );
+    ic_delete_global( 'in_shortcode' );
+    //ic_delete_global( 'shortcode_per_row' );
+    reset_row_class();
+
+    return $out;
 }
 
@@ -265 +265 @@
 
 function single_scripts() {
-    if ( is_ic_product_page() && is_lightbox_enabled() ) {
-        wp_enqueue_style( 'colorbox' );
-    }
+    if ( is_ic_product_page() && is_lightbox_enabled() ) {
+        wp_enqueue_style( 'colorbox' );
+    }
 }
 
@@ -279 +279 @@
  */
 function set_products_limit( $query ) {
-    $archive_multiple_settings = get_multiple_settings();
-    //if ( !is_admin() && $query->is_main_query() && (is_ic_product_listing( $query ) || is_ic_taxonomy_page() || is_home_archive( $query ) || is_ic_product_search()) ) {
-    $current_per_page = $query->get( 'posts_per_page' );
-    if ( $current_per_page !== - 1 && ! isset( $query->query['post__in'] ) && empty( $query->query['suppress_filters'] ) ) {
-        $query->set( 'posts_per_page', $archive_multiple_settings['archive_products_limit'] );
-    }
-    if ( ic_ic_catalog_archive( $query ) ) {
-        $query->set( 'post_status', ic_visible_product_status() );
-    }
-
-
-    //do_action( 'pre_get_al_products', $query );
-    //}
+    $archive_multiple_settings = get_multiple_settings();
+    //if ( !is_admin() && $query->is_main_query() && (is_ic_product_listing( $query ) || is_ic_taxonomy_page() || is_home_archive( $query ) || is_ic_product_search()) ) {
+    $current_per_page = $query->get( 'posts_per_page' );
+    if ( $current_per_page !== - 1 && ! isset( $query->query['post__in'] ) && empty( $query->query['suppress_filters'] ) ) {
+        $query->set( 'posts_per_page', $archive_multiple_settings['archive_products_limit'] );
+    }
+    if ( ic_ic_catalog_archive( $query ) ) {
+        $query->set( 'post_status', ic_visible_product_status() );
+    }
+
+
+    //do_action( 'pre_get_al_products', $query );
+    //}
 }
 
@@ -297 +297 @@
 
 function set_category_products_limit( $query ) {
-    if ( ! is_admin() && $query->is_main_query() && is_ic_taxonomy_page( $query ) ) {
-        $archive_multiple_settings = get_multiple_settings();
-        $current_per_page          = $query->get( 'posts_per_page' );
-        if ( $current_per_page !== - 1 && ! isset( $query->query['post__in'] ) && empty( $query->query['suppress_filters'] ) ) {
-            $query->set( 'posts_per_page', $archive_multiple_settings['archive_products_limit'] );
-        }
-    }
+    if ( ! is_admin() && $query->is_main_query() && is_ic_taxonomy_page( $query ) ) {
+        $archive_multiple_settings = get_multiple_settings();
+        $current_per_page          = $query->get( 'posts_per_page' );
+        if ( $current_per_page !== - 1 && ! isset( $query->query['post__in'] ) && empty( $query->query['suppress_filters'] ) ) {
+            $query->set( 'posts_per_page', $archive_multiple_settings['archive_products_limit'] );
+        }
+    }
 }
 
@@ -316 +316 @@
  */
 function product_archive_pagination( $wp_query = null ) {
-    /*
-      if ( is_ic_only_main_cats() && !is_product_filters_active() && !is_ic_ajax() ) {
-      return;
-      }
-     *
-     */
-    if ( ! isset( $wp_query ) || ! is_object( $wp_query ) ) {
-        global $paged, $wp_query;
-    }
-    if ( $wp_query->max_num_pages <= 1 ) {
-        return;
-    }
-    $multiple_settings = get_multiple_settings();
-    if ( ! is_ic_ajax() && ( is_ic_product_listing( $wp_query ) || ! is_ic_catalog_page( $wp_query ) ) && $multiple_settings['product_listing_cats'] == 'forced_cats_only' ) {
-        return;
-    }
-    if ( $wp_query->get( 'paged' ) ) {
-        $paged = absint( $wp_query->get( 'paged' ) );
-    } elseif ( $wp_query->get( 'page' ) ) {
-        $paged = absint( $wp_query->get( 'page' ) );
-    } else {
-        $paged = 1;
-    }
-    $max = intval( $wp_query->max_num_pages );
-    if ( $paged >= 1 ) {
-        $links[] = $paged;
-    }
-    if ( $paged >= 3 ) {
-        $links[] = $paged - 1;
-        $links[] = $paged - 2;
-    }
-    if ( ( $paged + 2 ) <= $max ) {
-        $links[] = $paged + 2;
-        $links[] = $paged + 1;
-    }
-    $names = get_archive_names();
-    echo '<div id="product_archive_nav" class="product-archive-nav ' . design_schemes( 'box', 0 ) . '"><ul>' . "\n";
-    if ( get_previous_posts_link( $names['previous_products'] ) ) {
-        $previous = $paged - 1;
-        printf( '<li class="previous-page" data-page="' . $previous . '">%s</li> ' . "\n", get_previous_posts_link( '<span>' . $names['previous_products'] . '</span>' ) );
-    }
-    $pre_page_buttons = apply_filters( 'ic_product_archive_nav_buttons', '', $links, $max, $paged );
-    if ( empty( $pre_page_buttons ) ) {
-        if ( ! in_array( 1, $links ) ) {
-            $class = 1 == $paged ? ' class="active first-num"' : ' class="first-num"';
-            printf( '<li%s data-page="1"><a href="%s">%s</a></li> ' . "\n", $class, esc_url( get_pagenum_link( 1 ) ), '1' );
-            if ( ! in_array( 2, $links ) ) {
-                echo '<li class="nav-dots">...</li>';
-            }
-        }
-        sort( $links );
-        foreach ( (array) $links as $link ) {
-            $class = $paged == $link ? ' class="active"' : '';
-            printf( '<li%s data-page="' . $link . '"><a href="%s">%s</a></li> ' . "\n", $class, esc_url( get_pagenum_link( $link ) ), $link );
-        }
-        if ( ! in_array( $max, $links ) ) {
-            if ( ! in_array( $max - 1, $links ) ) {
-                echo '<li class="nav-dots">...</li>' . "\n";
-            }
-            $class = $paged == $max ? ' class="active last-num"' : ' class="last-num"';
-            printf( '<li%s data-page="' . $max . '"><a href="%s">%s</a></li> ' . "\n", $class, esc_url( get_pagenum_link( $max ) ), $max );
-        }
-    } else {
-        echo $pre_page_buttons;
-    }
-    if ( get_next_posts_link( $names['next_products'], $max ) ) {
-        $next = $paged + 1;
-        printf( '<li class="next-page" data-page="' . $next . '">%s</li> ' . "\n", get_next_posts_link( '<span>' . $names['next_products'] . '</span>', $max ) );
-    }
-    echo '</ul></div>' . "\n";
-    wp_reset_postdata();
+    /*
+      if ( is_ic_only_main_cats() && !is_product_filters_active() && !is_ic_ajax() ) {
+      return;
+      }
+     *
+     */
+    if ( ! isset( $wp_query ) || ! is_object( $wp_query ) ) {
+        global $paged, $wp_query;
+    }
+    if ( $wp_query->max_num_pages <= 1 ) {
+        return;
+    }
+    $multiple_settings = get_multiple_settings();
+    if ( ! is_ic_ajax() && ( is_ic_product_listing( $wp_query ) || ! is_ic_catalog_page( $wp_query ) ) && $multiple_settings['product_listing_cats'] == 'forced_cats_only' ) {
+        return;
+    }
+    if ( $wp_query->get( 'paged' ) ) {
+        $paged = absint( $wp_query->get( 'paged' ) );
+    } elseif ( $wp_query->get( 'page' ) ) {
+        $paged = absint( $wp_query->get( 'page' ) );
+    } else {
+        $paged = 1;
+    }
+    $max = intval( $wp_query->max_num_pages );
+    if ( $paged >= 1 ) {
+        $links[] = $paged;
+    }
+    if ( $paged >= 3 ) {
+        $links[] = $paged - 1;
+        $links[] = $paged - 2;
+    }
+    if ( ( $paged + 2 ) <= $max ) {
+        $links[] = $paged + 2;
+        $links[] = $paged + 1;
+    }
+    $names = get_archive_names();
+    echo '<div id="product_archive_nav" class="product-archive-nav ' . design_schemes( 'box', 0 ) . '"><ul>' . "\n";
+    if ( get_previous_posts_link( $names['previous_products'] ) ) {
+        $previous = $paged - 1;
+        printf( '<li class="previous-page" data-page="' . $previous . '">%s</li> ' . "\n", get_previous_posts_link( '<span>' . $names['previous_products'] . '</span>' ) );
+    }
+    $pre_page_buttons = apply_filters( 'ic_product_archive_nav_buttons', '', $links, $max, $paged );
+    if ( empty( $pre_page_buttons ) ) {
+        if ( ! in_array( 1, $links ) ) {
+            $class = 1 == $paged ? ' class="active first-num"' : ' class="first-num"';
+            printf( '<li%s data-page="1"><a href="%s">%s</a></li> ' . "\n", $class, esc_url( get_pagenum_link( 1 ) ), '1' );
+            if ( ! in_array( 2, $links ) ) {
+                echo '<li class="nav-dots">...</li>';
+            }
+        }
+        sort( $links );
+        foreach ( (array) $links as $link ) {
+            $class = $paged == $link ? ' class="active"' : '';
+            printf( '<li%s data-page="' . $link . '"><a href="%s">%s</a></li> ' . "\n", $class, esc_url( get_pagenum_link( $link ) ), $link );
+        }
+        if ( ! in_array( $max, $links ) ) {
+            if ( ! in_array( $max - 1, $links ) ) {
+                echo '<li class="nav-dots">...</li>' . "\n";
+            }
+            $class = $paged == $max ? ' class="active last-num"' : ' class="last-num"';
+            printf( '<li%s data-page="' . $max . '"><a href="%s">%s</a></li> ' . "\n", $class, esc_url( get_pagenum_link( $max ) ), $max );
+        }
+    } else {
+        echo $pre_page_buttons;
+    }
+    if ( get_next_posts_link( $names['next_products'], $max ) ) {
+        $next = $paged + 1;
+        printf( '<li class="next-page" data-page="' . $next . '">%s</li> ' . "\n", get_next_posts_link( '<span>' . $names['next_products'] . '</span>', $max ) );
+    }
+    echo '</ul></div>' . "\n";
+    wp_reset_postdata();
 }
 
 function get_catalog_template( $archive_template, $post, $i = null, $design_scheme = null ) {
-    $themes_array                      = apply_filters( 'ecommerce_catalog_templates', array(
-        'default' => get_default_archive_theme( $post, $archive_template ),
-        'list'    => get_list_archive_theme( $post, $archive_template ),
-        'grid'    => get_grid_archive_theme( $post, $archive_template ),
-    ), $post, $i, $design_scheme, $archive_template );
-    $themes_array[ $archive_template ] = isset( $themes_array[ $archive_template ] ) ? $themes_array[ $archive_template ] : $themes_array['default'];
-    $themes_array[ $archive_template ] = empty( $themes_array[ $archive_template ] ) ? get_default_archive_theme( $post, 'default' ) : $themes_array[ $archive_template ];
-
-    return $themes_array[ $archive_template ];
+    $themes_array                      = apply_filters( 'ecommerce_catalog_templates', array(
+            'default' => get_default_archive_theme( $post, $archive_template ),
+            'list'    => get_list_archive_theme( $post, $archive_template ),
+            'grid'    => get_grid_archive_theme( $post, $archive_template ),
+    ), $post, $i, $design_scheme, $archive_template );
+    $themes_array[ $archive_template ] = isset( $themes_array[ $archive_template ] ) ? $themes_array[ $archive_template ] : $themes_array['default'];
+    $themes_array[ $archive_template ] = empty( $themes_array[ $archive_template ] ) ? get_default_archive_theme( $post, 'default' ) : $themes_array[ $archive_template ];
+
+    return $themes_array[ $archive_template ];
 }
 
 function get_product_category_template( $archive_template, $product_cat, $i = null, $design_scheme = null ) {
-    $themes_array                      = apply_filters( 'ecommerce_category_templates', array(
-        'default' => get_default_category_theme( $product_cat, $archive_template ),
-        'list'    => get_list_category_theme( $product_cat, $archive_template ),
-        'grid'    => get_grid_category_theme( $product_cat, $archive_template ),
-    ), $product_cat, $i, $design_scheme, $archive_template );
-    $themes_array[ $archive_template ] = isset( $themes_array[ $archive_template ] ) ? $themes_array[ $archive_template ] : $themes_array['default'];
-    if ( empty( $themes_array[ $archive_template ] ) ) {
-        if ( empty( $themes_array['default'] ) ) {
-            $themes_array[ $archive_template ] = get_default_category_theme( $product_cat, 'default' );
-        } else {
-            $themes_array[ $archive_template ] = $themes_array['default'];
-        }
-    }
-
-    return $themes_array[ $archive_template ];
+    $themes_array                      = apply_filters( 'ecommerce_category_templates', array(
+            'default' => get_default_category_theme( $product_cat, $archive_template ),
+            'list'    => get_list_category_theme( $product_cat, $archive_template ),
+            'grid'    => get_grid_category_theme( $product_cat, $archive_template ),
+    ), $product_cat, $i, $design_scheme, $archive_template );
+    $themes_array[ $archive_template ] = isset( $themes_array[ $archive_template ] ) ? $themes_array[ $archive_template ] : $themes_array['default'];
+    if ( empty( $themes_array[ $archive_template ] ) ) {
+        if ( empty( $themes_array['default'] ) ) {
+            $themes_array[ $archive_template ] = get_default_category_theme( $product_cat, 'default' );
+        } else {
+            $themes_array[ $archive_template ] = $themes_array['default'];
+        }
+    }
+
+    return $themes_array[ $archive_template ];
 }
 
 function ic_get_available_templates() {
-    $templates = array(
-        'default' => __( 'Modern Grid', 'ecommerce-product-catalog' ),
-        'list'    => __( 'Classic List', 'ecommerce-product-catalog' ),
-        'grid'    => __( 'Classic Grid', 'ecommerce-product-catalog' )
-    );
-
-    return apply_filters( 'ic_epc_available_templates', $templates );
+    $templates = array(
+            'default' => __( 'Modern Grid', 'ecommerce-product-catalog' ),
+            'list'    => __( 'Classic List', 'ecommerce-product-catalog' ),
+            'grid'    => __( 'Classic Grid', 'ecommerce-product-catalog' )
+    );
+
+    return apply_filters( 'ic_epc_available_templates', $templates );
 }
 
 function more_products() {
-    global $wp_query, $shortcode_query;
-    $post_type = apply_filters( 'current_product_post_type', 'al_product' );
-    $taxonomy  = apply_filters( 'current_product_catalog_taxonomy', 'al_product-cat' );
-    if ( empty( $wp_query->is_single ) && ( empty( $wp_query->is_page ) || ic_get_global( 'inside_show_catalog_shortcode' ) ) && ( ( isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == $post_type ) || ( isset( $wp_query->query_vars['post_type'] ) && is_array( $wp_query->query_vars['post_type'] ) && array_search( $post_type, $wp_query->query_vars['post_type'] ) !== false ) || ( is_string( $taxonomy ) && isset( $wp_query->query[ $taxonomy ] ) ) ) ) {
-        $y_query = $wp_query;
-    } else {
-        $y_query = $shortcode_query;
-    }
-    if ( empty( $y_query ) ) {
-        $y_query = $wp_query;
-    }
-    if ( ! empty( $y_query->posts ) && is_array( $y_query->posts ) && apply_filters( 'ic_query_check_if_product', true, $y_query ) ) {
-        if ( ! empty( $y_query->posts[0]->ID ) && ! is_ic_product( $y_query->posts[0]->ID ) ) {
-
-            return false;
-        }
-    }
-    if ( isset( $y_query->current_post ) ) {
-        return $y_query->current_post + 1 < $y_query->post_count;
-    } else {
-
-        return false;
-    }
+    global $wp_query, $shortcode_query;
+    $post_type = apply_filters( 'current_product_post_type', 'al_product' );
+    $taxonomy  = apply_filters( 'current_product_catalog_taxonomy', 'al_product-cat' );
+    if ( empty( $wp_query->is_single ) && ( empty( $wp_query->is_page ) || ic_get_global( 'inside_show_catalog_shortcode' ) ) && ( ( isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == $post_type ) || ( isset( $wp_query->query_vars['post_type'] ) && is_array( $wp_query->query_vars['post_type'] ) && array_search( $post_type, $wp_query->query_vars['post_type'] ) !== false ) || ( is_string( $taxonomy ) && isset( $wp_query->query[ $taxonomy ] ) ) ) ) {
+        $y_query = $wp_query;
+    } else {
+        $y_query = $shortcode_query;
+    }
+    if ( empty( $y_query ) ) {
+        $y_query = $wp_query;
+    }
+    if ( ! empty( $y_query->posts ) && is_array( $y_query->posts ) && apply_filters( 'ic_query_check_if_product', true, $y_query ) ) {
+        if ( ! empty( $y_query->posts[0]->ID ) && ! is_ic_product( $y_query->posts[0]->ID ) ) {
+
+            return false;
+        }
+    }
+    if ( isset( $y_query->current_post ) ) {
+        return $y_query->current_post + 1 < $y_query->post_count;
+    } else {
+
+        return false;
+    }
 }
 
 function more_product_cats() {
-    global $cat_shortcode_query;
-    if ( isset( $cat_shortcode_query['current'] ) ) {
-
-        return $cat_shortcode_query['current'] + 1 < $cat_shortcode_query['count'];
-    } else {
-        return false;
-    }
+    global $cat_shortcode_query;
+    if ( isset( $cat_shortcode_query['current'] ) ) {
+
+        return $cat_shortcode_query['current'] + 1 < $cat_shortcode_query['count'];
+    } else {
+        return false;
+    }
 }
 
 function get_row_class( $grid_settings, $what = 'products' ) {
-    $row_class = 'full';
-    if ( is_ic_shortcode_query() ) {
-        $shortcode_per_row = ic_get_global( 'shortcode_per_row' );
-        if ( $shortcode_per_row ) {
-            $grid_settings['entries']            = $shortcode_per_row;
-            $grid_settings['per-row-categories'] = $shortcode_per_row;
-        }
-    }
-    if ( $what === 'products' ) {
-        $per_row = $grid_settings['entries'];
-    } else {
-        $per_row = $grid_settings['per-row-categories'];
-    }
-    if ( $per_row != '' ) {
-        global $ic_row;
-        if ( $ic_row > $per_row || ! isset( $ic_row ) ) {
-            $ic_row = 1;
-        }
-
-        $count = $ic_row - $per_row;
-        if ( $ic_row == 1 ) {
-            $row_class = 'first';
-        } else if ( $count == 0 ) {
-            $row_class = 'last';
-        } else {
-            $row_class = 'middle';
-        }
-        if ( more_products() || more_product_cats() ) {
-            $ic_row ++;
-        } else {
-            $ic_row = 1;
-        }
-    }
-
-    return $row_class;
+    $row_class = 'full';
+    if ( is_ic_shortcode_query() ) {
+        $shortcode_per_row = ic_get_global( 'shortcode_per_row' );
+        if ( $shortcode_per_row ) {
+            $grid_settings['entries']            = $shortcode_per_row;
+            $grid_settings['per-row-categories'] = $shortcode_per_row;
+        }
+    }
+    if ( $what === 'products' ) {
+        $per_row = $grid_settings['entries'];
+    } else {
+        $per_row = $grid_settings['per-row-categories'];
+    }
+    if ( $per_row != '' ) {
+        global $ic_row;
+        if ( $ic_row > $per_row || ! isset( $ic_row ) ) {
+            $ic_row = 1;
+        }
+
+        $count = $ic_row - $per_row;
+        if ( $ic_row == 1 ) {
+            $row_class = 'first';
+        } else if ( $count == 0 ) {
+            $row_class = 'last';
+        } else {
+            $row_class = 'middle';
+        }
+        if ( more_products() || more_product_cats() ) {
+            $ic_row ++;
+        } else {
+            $ic_row = 1;
+        }
+    }
+
+    return $row_class;
 }
 
@@ -506 +506 @@
 
 function reset_row_class() {
-    global $ic_row;
-    $ic_row = 1;
-    ic_delete_global( 'shortcode_per_row' );
+    global $ic_row;
+    $ic_row = 1;
+    ic_delete_global( 'shortcode_per_row' );
 }
 
@@ -521 +521 @@
  */
 function product_post_class( $classes ) {
-    if ( is_ic_catalog_page() ) {
-        if ( $key = array_search( 'has-post-thumbnail', $classes ) !== false ) {
-            unset( $classes[ $key ] );
-        }
-        $classes[] = 'al_product';
-        $classes[] = 'responsive';
-        if ( is_ic_product_page() ) {
-            $single_options = get_product_page_settings();
-            $classes[]      = $single_options['template'];
-            $classes[]      = 'ic-template-' . $single_options['template'];
-            $product_id     = ic_get_product_id();
-            if ( ! empty( $product_id ) ) {
-                $classes[] = 'product-' . $product_id;
-            }
-            $classes = apply_filters( 'product-page-class', $classes, $product_id );
-        }
-    }
-
-    return $classes;
+    if ( is_ic_catalog_page() ) {
+        if ( $key = array_search( 'has-post-thumbnail', $classes ) !== false ) {
+            unset( $classes[ $key ] );
+        }
+        $classes[] = 'al_product';
+        $classes[] = 'responsive';
+        if ( is_ic_product_page() ) {
+            $single_options = get_product_page_settings();
+            $classes[]      = $single_options['template'];
+            $classes[]      = 'ic-template-' . $single_options['template'];
+            $product_id     = ic_get_product_id();
+            if ( ! empty( $product_id ) ) {
+                $classes[] = 'product-' . $product_id;
+            }
+            $classes = apply_filters( 'product-page-class', $classes, $product_id );
+        }
+    }
+
+    return $classes;
 }
 
@@ -550 +550 @@
  */
 function product_listing_additional_styles( $archive_template ) {
-    if ( current_filter() === 'product_listing_entry_inside' ) {
-        remove_action( 'before_product_list', 'product_listing_additional_styles' );
-    } else if ( current_filter() === 'before_product_list' ) {
-        remove_action( 'product_listing_entry_inside', 'product_listing_additional_styles' );
-    }
-    $styles = '<style>';
-    $styles = apply_filters( 'product_listing_additional_styles', $styles, $archive_template );
-    $styles .= '</style>';
-    if ( $styles != '<style></style>' && ! is_ic_admin() ) {
-        echo $styles;
-    }
+    if ( current_filter() === 'product_listing_entry_inside' ) {
+        remove_action( 'before_product_list', 'product_listing_additional_styles' );
+    } else if ( current_filter() === 'before_product_list' ) {
+        remove_action( 'product_listing_entry_inside', 'product_listing_additional_styles' );
+    }
+    $styles = '<style>';
+    $styles = apply_filters( 'product_listing_additional_styles', $styles, $archive_template );
+    $styles .= '</style>';
+    if ( $styles != '<style></style>' && ! is_ic_admin() ) {
+        echo $styles;
+    }
 }
 
@@ -570 +570 @@
  */
 function product_page_additional_styles() {
-    $styles = '<style>';
-    $styles = apply_filters( 'product_page_additional_styles', $styles );
-    $styles .= '</style>';
-    if ( $styles != '<style></style>' && ! is_ic_admin() ) {
-        echo $styles;
-    }
+    $styles = '<style>';
+    $styles = apply_filters( 'product_page_additional_styles', $styles );
+    $styles .= '</style>';
+    if ( $styles != '<style></style>' && ! is_ic_admin() ) {
+        echo $styles;
+    }
 }
 
@@ -584 +584 @@
  */
 function get_product_listing_template() {
-    global $shortcode_query;
-    $default = 'default';
-    if ( ! empty( $shortcode_query ) ) {
-        global $archive_template;
-        $archive_template = isset( $archive_template ) ? $archive_template : get_option( 'archive_template', $default );
-    } else {
-        $archive_template = get_option( 'archive_template', $default );
-    }
-    $archive_template = ! empty( $archive_template ) ? $archive_template : $default;
-
-    return apply_filters( 'product_listing_template', $archive_template );
+    global $shortcode_query;
+    $default = 'default';
+    if ( ! empty( $shortcode_query ) ) {
+        global $archive_template;
+        $archive_template = isset( $archive_template ) ? $archive_template : get_option( 'archive_template', $default );
+    } else {
+        $archive_template = get_option( 'archive_template', $default );
+    }
+    $archive_template = ! empty( $archive_template ) ? $archive_template : $default;
+
+    return apply_filters( 'product_listing_template', $archive_template );
 }
 
@@ -636 +636 @@
  */
 function override_product_page_title( $page_title, $id = null ) {
-    $listing_id = get_product_listing_id();
-    if ( ! is_admin() && is_ic_catalog_page() && ! is_ic_product_page() && ! in_the_ic_loop() && ! is_filter_bar() && ( empty( $id ) || ( get_quasi_post_type( get_post_type( $id ) ) == 'al_product' ) ) || $listing_id == $id ) {
-        $query = null;
-        if ( $listing_id === 'noid' ) {
-            return $page_title;
-        }
-        if ( is_ic_shortcode_integration() ) {
-            global $wp_query;
-            $this_query = ic_get_global( 'pre_shortcode_query' );
-            if ( $this_query ) {
-                $wp_query = $this_query;
-            }
-        } else {
-            return $page_title;
-        }
-        if ( is_ic_taxonomy_page( $query ) && ( empty( $id ) || ! is_ic_product( $id ) ) && $listing_id != $id ) {
-            $page_title = get_product_tax_title( $page_title );
-        } else if ( is_ic_product_search( $query ) ) {
-            $page_title = ic_get_search_page_title();
-        } else if ( is_ic_product_listing( $query ) && ( empty( $id ) || $id == $listing_id ) ) {
-            $page_title = get_product_listing_title();
-        }
-    }
-
-    return $page_title;
+    $listing_id = get_product_listing_id();
+    if ( ! is_admin() && is_ic_catalog_page() && ! is_ic_product_page() && ! in_the_ic_loop() && ! is_filter_bar() && ( empty( $id ) || ( get_quasi_post_type( get_post_type( $id ) ) == 'al_product' ) ) || $listing_id == $id ) {
+        $query = null;
+        if ( $listing_id === 'noid' ) {
+            return $page_title;
+        }
+        if ( is_ic_shortcode_integration() ) {
+            global $wp_query;
+            $this_query = ic_get_global( 'pre_shortcode_query' );
+            if ( $this_query ) {
+                $wp_query = $this_query;
+            }
+        } else {
+            return $page_title;
+        }
+        if ( is_ic_taxonomy_page( $query ) && ( empty( $id ) || ! is_ic_product( $id ) ) && $listing_id != $id ) {
+            $page_title = get_product_tax_title( $page_title );
+        } else if ( is_ic_product_search( $query ) ) {
+            $page_title = ic_get_search_page_title();
+        } else if ( is_ic_product_listing( $query ) && ( empty( $id ) || $id == $listing_id ) ) {
+            $page_title = get_product_listing_title();
+        }
+    }
+
+    return $page_title;
 }
 
@@ -666 +666 @@
 
 function ic_catalog_set_post_title() {
-    if ( is_ic_simple_mode() || is_ic_theme_mode() ) {
-        return;
-    }
-    if ( is_ic_product_listing() ) {
-        $page_title = get_product_listing_title();
-    } else if ( is_ic_taxonomy_page() ) {
-        $page_title = get_product_tax_title();
-    }
-    if ( ! empty( $page_title ) ) {
-        global $post;
-        if ( ! empty( $post->ID ) ) {
-            ic_save_global( 'pre_title_post_' . $post->ID, $post->post_title );
-            $post->post_title = $page_title;
-            add_action( 'before_product_list', 'ic_catalog_reset_post_title' );
-        }
-    }
+    if ( is_ic_simple_mode() || is_ic_theme_mode() ) {
+        return;
+    }
+    if ( is_ic_product_listing() ) {
+        $page_title = get_product_listing_title();
+    } else if ( is_ic_taxonomy_page() ) {
+        $page_title = get_product_tax_title();
+    }
+    if ( ! empty( $page_title ) ) {
+        global $post;
+        if ( ! empty( $post->ID ) ) {
+            ic_save_global( 'pre_title_post_' . $post->ID, $post->post_title );
+            $post->post_title = $page_title;
+            add_action( 'before_product_list', 'ic_catalog_reset_post_title' );
+        }
+    }
 }
 
 function ic_catalog_reset_post_title() {
-    if ( is_ic_in_shortcode() ) {
-        return;
-    }
-    global $post;
-    the_post();
-    if ( ! empty( $post->ID ) ) {
-        $pre_title = ic_get_global( 'pre_title_post_' . $post->ID );
-        if ( ! empty( $pre_title ) ) {
-            $post->post_title = $pre_title;
-            ic_delete_global( 'pre_title_post_' . $post->ID );
-            remove_action( 'before_product_list', 'ic_catalog_reset_post_title' );
-        }
-    }
-    rewind_posts();
+    if ( is_ic_in_shortcode() ) {
+        return;
+    }
+    global $post;
+    the_post();
+    if ( ! empty( $post->ID ) ) {
+        $pre_title = ic_get_global( 'pre_title_post_' . $post->ID );
+        if ( ! empty( $pre_title ) ) {
+            $post->post_title = $pre_title;
+            ic_delete_global( 'pre_title_post_' . $post->ID );
+            remove_action( 'before_product_list', 'ic_catalog_reset_post_title' );
+        }
+    }
+    rewind_posts();
 }
 
 function ic_get_search_page_title() {
-    if ( ! empty( $_GET['s'] ) ) {
-        $search = $_GET['s'];
-    } else {
-        $search = get_search_query( false );
-        if ( empty( $search ) ) {
-            $query = ic_get_catalog_query();
-            if ( ! empty( $query->query['s'] ) ) {
-                $search = $query->query['s'];
-            }
-        }
-
-    }
-
-    return __( 'Search Results for:', 'ecommerce-product-catalog' ) . ' <span class="ic-search-keyword">' . wp_unslash( esc_html( strval( $search ) ) ) . '</span>';
+    if ( ! empty( $_GET['s'] ) ) {
+        $search = $_GET['s'];
+    } else {
+        $search = get_search_query( false );
+        if ( empty( $search ) ) {
+            $query = ic_get_catalog_query();
+            if ( ! empty( $query->query['s'] ) ) {
+                $search = $query->query['s'];
+            }
+        }
+
+    }
+
+    return __( 'Search Results for:', 'ecommerce-product-catalog' ) . ' <span class="ic-search-keyword">' . wp_unslash( esc_html( strval( $search ) ) ) . '</span>';
 }
 
 function get_product_listing_title() {
-    $archive_names = get_archive_names();
-    $def_page_id   = get_product_listing_id();
-    $page_id       = apply_filters( 'before_archive_post_id', $def_page_id );
-
-    $page = empty( $page_id ) ? '' : get_post( $page_id );
-    if ( $page == '' ) {
-        $archive_multiple_settings = get_multiple_settings();
-        if ( $archive_multiple_settings['product_listing_cats'] == 'off' ) {
-            $page_title = $archive_names['all_products'];
-        } else {
-            $page_title = $archive_names['all_main_categories'];
-        }
-    } else {
-        //remove_filter( 'the_title', 'override_product_page_title', 11, 2 );
-        $page_title = apply_filters( 'the_title', $page->post_title, $page_id );
-        //add_filter( 'the_title', 'override_product_page_title', 11, 2 );
-    }
-
-    return apply_filters( 'ic_product_listing_title', $page_title, $page );
+    $archive_names = get_archive_names();
+    $def_page_id   = get_product_listing_id();
+    $page_id       = apply_filters( 'before_archive_post_id', $def_page_id );
+
+    $page = empty( $page_id ) ? '' : get_post( $page_id );
+    if ( $page == '' ) {
+        $archive_multiple_settings = get_multiple_settings();
+        if ( $archive_multiple_settings['product_listing_cats'] == 'off' ) {
+            $page_title = $archive_names['all_products'];
+        } else {
+            $page_title = $archive_names['all_main_categories'];
+        }
+    } else {
+        //remove_filter( 'the_title', 'override_product_page_title', 11, 2 );
+        $page_title = apply_filters( 'the_title', $page->post_title, $page_id );
+        //add_filter( 'the_title', 'override_product_page_title', 11, 2 );
+    }
+
+    return apply_filters( 'ic_product_listing_title', $page_title, $page );
 }
 
 function get_product_tax_title( $page_title = null ) {
-    $archive_names = get_archive_names();
-    $the_tax       = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
-    if ( isset( $the_tax->name ) ) {
-        $name = $the_tax->name;
-    } else {
-        $name = $page_title;
-    }
-    if ( ! empty( $archive_names['all_prefix'] ) && has_shortcode( $archive_names['all_prefix'], 'product_category_name' ) ) {
-        $page_title = do_shortcode( $archive_names['all_prefix'] );
-    } else if ( ! empty( $archive_names['all_prefix'] ) && ! empty( $name ) ) {
-        $page_title = do_shortcode( $archive_names['all_prefix'] ) . ' ' . $name;
-    } else {
-        $page_title = $name;
-    }
-
-    return $page_title;
+    $archive_names = get_archive_names();
+    $the_tax       = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
+    if ( isset( $the_tax->name ) ) {
+        $name = $the_tax->name;
+    } else {
+        $name = $page_title;
+    }
+    if ( ! empty( $archive_names['all_prefix'] ) && has_shortcode( $archive_names['all_prefix'], 'product_category_name' ) ) {
+        $page_title = do_shortcode( $archive_names['all_prefix'] );
+    } else if ( ! empty( $archive_names['all_prefix'] ) && ! empty( $name ) ) {
+        $page_title = do_shortcode( $archive_names['all_prefix'] ) . ' ' . $name;
+    } else {
+        $page_title = $name;
+    }
+
+    return $page_title;
 }
 
@@ -771 +771 @@
  */
 function product_listing_current_nav_class( $classes, $item ) {
-    global $post;
-    if ( isset( $post->ID ) && is_ic_product_listing() ) {
-        if ( isset( $item->object_id ) && $item->object_id == get_product_listing_id() ) {
-
-            //$current_post_type         = get_post_type_object( get_post_type( $post->ID ) );
-            //$current_post_type_slug    = $current_post_type->rewrite[ 'slug' ];
-            //$current_post_type_slug    = !empty( $current_post_type_slug ) ? '/' . $current_post_type_slug . '/' : $current_post_type_slug;
-            //$menu_slug                 = ic_strtolower( trim( $item->url ) );
-            //if ( strpos( $menu_slug, $current_post_type_slug ) !== false ) {
-            $classes[] = 'current-menu-item';
-            $classes[] = 'current_page_item';
-            //}
-        } else {
-            if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
-                unset( $classes[ $key ] );
-            }
-            if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
-                unset( $classes[ $key ] );
-            }
-        }
-    } else if ( isset( $post->ID ) && ( is_ic_product_page() || is_ic_taxonomy_page() ) ) {
-        if ( isset( $item->object ) && strpos( $item->object, 'al_product-cat' ) === false && $item->object != 'custom' ) {
-            if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
-                unset( $classes[ $key ] );
-            }
-            if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
-                unset( $classes[ $key ] );
-            }
-        }
-    }
-
-    return $classes;
+    global $post;
+    if ( isset( $post->ID ) && is_ic_product_listing() ) {
+        if ( isset( $item->object_id ) && $item->object_id == get_product_listing_id() ) {
+
+            //$current_post_type         = get_post_type_object( get_post_type( $post->ID ) );
+            //$current_post_type_slug    = $current_post_type->rewrite[ 'slug' ];
+            //$current_post_type_slug    = !empty( $current_post_type_slug ) ? '/' . $current_post_type_slug . '/' : $current_post_type_slug;
+            //$menu_slug                 = ic_strtolower( trim( $item->url ) );
+            //if ( strpos( $menu_slug, $current_post_type_slug ) !== false ) {
+            $classes[] = 'current-menu-item';
+            $classes[] = 'current_page_item';
+            //}
+        } else {
+            if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
+                unset( $classes[ $key ] );
+            }
+            if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
+                unset( $classes[ $key ] );
+            }
+        }
+    } else if ( isset( $post->ID ) && ( is_ic_product_page() || is_ic_taxonomy_page() ) ) {
+        if ( isset( $item->object ) && strpos( $item->object, 'al_product-cat' ) === false && $item->object != 'custom' ) {
+            if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
+                unset( $classes[ $key ] );
+            }
+            if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
+                unset( $classes[ $key ] );
+            }
+        }
+    }
+
+    return $classes;
 }
 
@@ -817 +817 @@
  */
 function product_listing_page_nav_class( $classes, $page ) {
-    global $post;
-    if ( isset( $post->ID ) && is_ic_product_listing() ) {
-        if ( $page->ID == get_product_listing_id() ) {
-            //$current_post_type         = get_post_type_object( get_post_type( $post->ID ) );
-            //$current_post_type_slug    = $current_post_type->rewrite[ 'slug' ];
-            //$menu_slug                 = $page->post_name;
-            //if ( $menu_slug == $current_post_type_slug ) {
-            $classes[] = 'current-menu-item';
-            $classes[] = 'current_page_item';
-            //}
-        } else {
-            if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
-                unset( $classes[ $key ] );
-            }
-            if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
-                unset( $classes[ $key ] );
-            }
-        }
-    } else if ( isset( $post->ID ) && ( is_ic_product_page() || is_ic_taxonomy_page() ) ) {
-        if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
-            unset( $classes[ $key ] );
-        }
-        if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
-            unset( $classes[ $key ] );
-        }
-    }
-
-    return $classes;
+    global $post;
+    if ( isset( $post->ID ) && is_ic_product_listing() ) {
+        if ( $page->ID == get_product_listing_id() ) {
+            //$current_post_type         = get_post_type_object( get_post_type( $post->ID ) );
+            //$current_post_type_slug    = $current_post_type->rewrite[ 'slug' ];
+            //$menu_slug                 = $page->post_name;
+            //if ( $menu_slug == $current_post_type_slug ) {
+            $classes[] = 'current-menu-item';
+            $classes[] = 'current_page_item';
+            //}
+        } else {
+            if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
+                unset( $classes[ $key ] );
+            }
+            if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
+                unset( $classes[ $key ] );
+            }
+        }
+    } else if ( isset( $post->ID ) && ( is_ic_product_page() || is_ic_taxonomy_page() ) ) {
+        if ( ( $key = array_search( 'current-menu-item', $classes ) ) !== false ) {
+            unset( $classes[ $key ] );
+        }
+        if ( ( $key = array_search( 'current_page_parent', $classes ) ) !== false ) {
+            unset( $classes[ $key ] );
+        }
+    }
+
+    return $classes;
 }
 
@@ -852 +852 @@
  */
 function product_list_class( $archive_template, $where = 'product-list' ) {
-    return apply_filters( 'product-list-class', '', $where, $archive_template );
+    return apply_filters( 'product-list-class', '', $where, $archive_template );
 }
 
 function product_list_attr( $query = null ) {
-    return apply_filters( 'product-list-attr', '', $query );
+    return apply_filters( 'product-list-attr', '', $query );
 }
 
@@ -864 +864 @@
  */
 function product_class( $product_id ) {
-    $class = get_post_status( $product_id );
-
-    return apply_filters( 'product-class', $class, $product_id );
+    $class = get_post_status( $product_id );
+
+    return apply_filters( 'product-class', $class, $product_id );
 }
 
@@ -874 +874 @@
  */
 function product_category_class( $category_id ) {
-    return apply_filters( 'product-category-class', '', $category_id );
+    return apply_filters( 'product-category-class', '', $category_id );
 }
 
@@ -884 +884 @@
  */
 function product_list_categories_header() {
-    $archive_names = get_archive_names();
-    if ( ! empty( $archive_names['all_main_categories'] ) && ! isset( $shortcode_query ) ) {
-        $title = do_shortcode( $archive_names['all_main_categories'] );
-        if ( get_product_listing_title() != $title ) {
-            echo '<h2 class="catalog-header">' . do_shortcode( $archive_names['all_main_categories'] ) . '</h2>';
-        }
-    }
+    $archive_names = get_archive_names();
+    if ( ! empty( $archive_names['all_main_categories'] ) && ! isset( $shortcode_query ) ) {
+        $title = do_shortcode( $archive_names['all_main_categories'] );
+        if ( get_product_listing_title() != $title ) {
+            echo '<h2 class="catalog-header">' . do_shortcode( $archive_names['all_main_categories'] ) . '</h2>';
+        }
+    }
 }
 
@@ -900 +900 @@
  */
 function category_list_subcategories_header() {
-    if ( is_ic_taxonomy_page() ) {
-        $archive_names = get_archive_names();
-        if ( ! empty( $archive_names['all_subcategories'] ) && ! is_ic_shortcode_query() ) {
-            echo '<h2 class="catalog-header">' . do_shortcode( $archive_names['all_subcategories'] ) . '</h2>';
-        }
-    }
+    if ( is_ic_taxonomy_page() ) {
+        $archive_names = get_archive_names();
+        if ( ! empty( $archive_names['all_subcategories'] ) && ! is_ic_shortcode_query() ) {
+            echo '<h2 class="catalog-header">' . do_shortcode( $archive_names['all_subcategories'] ) . '</h2>';
+        }
+    }
 }
 
@@ -915 +915 @@
  */
 function product_list_header() {
-    $archive_names = get_archive_names();
-    if ( ( ! empty( $archive_names['all_products'] ) || ! empty( $archive_names['category_products'] ) ) && ! is_ic_shortcode_query() ) {
-        if ( is_ic_product_listing() && ! empty( $archive_names['all_products'] ) ) {
-            $title = do_shortcode( $archive_names['all_products'] );
-            if ( get_product_listing_title() != $title ) {
-                echo '<h2 class="catalog-header">' . $title . '</h2>';
-            }
-        } else if ( is_ic_taxonomy_page() && ! empty( $archive_names['category_products'] ) && is_ic_product_listing_showing_cats() ) {
-            //$the_tax = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
-            echo '<h2 class="catalog-header">' . do_shortcode( $archive_names['category_products'] ) . '</h2>';
-        }
-    }
+    $archive_names = get_archive_names();
+    if ( ( ! empty( $archive_names['all_products'] ) || ! empty( $archive_names['category_products'] ) ) && ! is_ic_shortcode_query() ) {
+        if ( is_ic_product_listing() && ! empty( $archive_names['all_products'] ) ) {
+            $title = do_shortcode( $archive_names['all_products'] );
+            if ( get_product_listing_title() != $title ) {
+                echo '<h2 class="catalog-header">' . $title . '</h2>';
+            }
+        } else if ( is_ic_taxonomy_page() && ! empty( $archive_names['category_products'] ) && is_ic_product_listing_showing_cats() ) {
+            //$the_tax = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
+            echo '<h2 class="catalog-header">' . do_shortcode( $archive_names['category_products'] ) . '</h2>';
+        }
+    }
 }
 
@@ -935 +935 @@
  */
 function design_settings_examples_image() {
-    return AL_PLUGIN_BASE_PATH . 'templates/themes/img/example-product.jpg';
+    return AL_PLUGIN_BASE_PATH . 'templates/themes/img/example-product.jpg';
 }
 
@@ -941 +941 @@
 
 function exclude_products_from_child_cat( $query ) {
-    if ( empty( $_GET['product_category'] ) && ( ! is_admin() || is_ic_ajax() ) && ( is_ic_ajax() || $query->is_main_query() ) && is_ic_taxonomy_page( $query ) && is_ic_only_main_cats( $query ) && ! is_product_filter_active( 'product_category' ) ) {
-        foreach ( $query->tax_query->queries as $i => $xquery ) {
-            if ( ! empty( $query->tax_query->queries[ $i ] ) && is_array( $query->tax_query->queries[ $i ] ) && ! empty( $query->tax_query->queries[ $i ]['taxonomy'] ) ) {
-                $query->tax_query->queries[ $i ]['include_children'] = 0;
-            }
-        }
-    }
+    if ( empty( $_GET['product_category'] ) && ( ! is_admin() || is_ic_ajax() ) && ( is_ic_ajax() || $query->is_main_query() ) && is_ic_taxonomy_page( $query ) && is_ic_only_main_cats( $query ) && ! is_product_filter_active( 'product_category' ) ) {
+        foreach ( $query->tax_query->queries as $i => $xquery ) {
+            if ( ! empty( $query->tax_query->queries[ $i ] ) && is_array( $query->tax_query->queries[ $i ] ) && ! empty( $query->tax_query->queries[ $i ]['taxonomy'] ) ) {
+                $query->tax_query->queries[ $i ]['include_children'] = 0;
+            }
+        }
+    }
 }
 
@@ -960 +960 @@
  */
 function add_classes_on_categories( $classes ) {
-    if ( is_tax() /* && is_ic_only_main_cats() */ ) {
-        $classes .= ' hentry status-publish';
-    }
-
-    return $classes;
+    if ( is_tax() /* && is_ic_only_main_cats() */ ) {
+        $classes .= ' hentry status-publish';
+    }
+
+    return $classes;
 }
 
@@ -974 +974 @@
  */
 function advanced_mode_styling() {
-    $settings = ic_catalog_theme_integration::settings();
-    $styling  = '<style>';
-    if ( $settings['container_width'] != 100 ) {
-        $styling .= '#container.content-area.product-catalog {width: ' . $settings['container_width'] . '%; margin: 0 auto; overflow: hidden; box-sizing: border-box; float: none;}';
-    }
-    if ( $settings['container_bg'] !== '' && ic_string_contains( $settings['container_bg'], '#' ) ) {
-        $styling .= '#container.content-area.product-catalog {background: ' . $settings['container_bg'] . ';}';
-    }
-    if ( $settings['container_padding'] != 0 ) {
-        $styling .= '.content-area.product-catalog #content {padding: ' . $settings['container_padding'] . 'px; box-sizing: border-box; float: none; }';
-        if ( is_ic_default_theme_sided_sidebar_active() ) {
-            $styling .= '.content-area.product-catalog #catalog_sidebar {padding: ' . $settings['container_padding'] . 'px; box-sizing: border-box;}';
-        }
-    }
-    if ( $settings['container_text'] !== '' && ic_string_contains( $settings['container_text'], '#' ) ) {
-        $styling .= '#container.content-area.product-catalog * {color: ' . $settings['container_text'] . ';}';
-    }
-    if ( $settings['default_sidebar'] == 'left' ) {
-        $styling .= '.content-area.product-catalog #catalog_sidebar {float: left;}';
-    }
-    if ( is_ic_default_theme_sided_sidebar_active() ) {
-        $styling .= '.content-area.product-catalog #content {width: 70%;';
-        if ( $settings['default_sidebar'] == 'left' ) {
-            $styling .= 'float:right;';
-        } else if ( $settings['default_sidebar'] == 'right' ) {
-            $styling .= 'float:left;';
-        }
-        $styling .= '}';
-    }
-    $styling .= apply_filters( 'advanced_mode_styling_rules', '' );
-    $styling .= '</style>';
-    if ( $styling != '<style></style>' ) {
-        echo $styling;
-    }
+    $settings = ic_catalog_theme_integration::settings();
+    $styling  = '<style>';
+    if ( $settings['container_width'] != 100 ) {
+        $styling .= '#container.content-area.product-catalog {width: ' . $settings['container_width'] . '%; margin: 0 auto; overflow: hidden; box-sizing: border-box; float: none;}';
+    }
+    if ( $settings['container_bg'] !== '' && ic_string_contains( $settings['container_bg'], '#' ) ) {
+        $styling .= '#container.content-area.product-catalog {background: ' . $settings['container_bg'] . ';}';
+    }
+    if ( $settings['container_padding'] != 0 ) {
+        $styling .= '.content-area.product-catalog #content {padding: ' . $settings['container_padding'] . 'px; box-sizing: border-box; float: none; }';
+        if ( is_ic_default_theme_sided_sidebar_active() ) {
+            $styling .= '.content-area.product-catalog #catalog_sidebar {padding: ' . $settings['container_padding'] . 'px; box-sizing: border-box;}';
+        }
+    }
+    if ( $settings['container_text'] !== '' && ic_string_contains( $settings['container_text'], '#' ) ) {
+        $styling .= '#container.content-area.product-catalog * {color: ' . $settings['container_text'] . ';}';
+    }
+    if ( $settings['default_sidebar'] == 'left' ) {
+        $styling .= '.content-area.product-catalog #catalog_sidebar {float: left;}';
+    }
+    if ( is_ic_default_theme_sided_sidebar_active() ) {
+        $styling .= '.content-area.product-catalog #content {width: 70%;';
+        if ( $settings['default_sidebar'] == 'left' ) {
+            $styling .= 'float:right;';
+        } else if ( $settings['default_sidebar'] == 'right' ) {
+            $styling .= 'float:left;';
+        }
+        $styling .= '}';
+    }
+    $styling .= apply_filters( 'advanced_mode_styling_rules', '' );
+    $styling .= '</style>';
+    if ( $styling != '<style></style>' ) {
+        echo $styling;
+    }
 }
 
@@ -1016 +1016 @@
  */
 function show_advanced_mode_default_sidebar() {
-    if ( is_ic_default_theme_sided_sidebar_active() || ( is_ic_integration_wizard_page() && isset( $_GET['test_advanced'] ) && $_GET['test_advanced'] == 1 ) ) {
-        add_action( 'advanced_mode_layout_after_content', 'advanced_mode_default_sided_sidebar' );
-    } else if ( is_ic_default_theme_sidebar_active() ) {
-        add_action( 'advanced_mode_layout_end', 'advanced_mode_default_sidebar' );
-    }
+    if ( is_ic_default_theme_sided_sidebar_active() || ( is_ic_integration_wizard_page() && isset( $_GET['test_advanced'] ) && $_GET['test_advanced'] == 1 ) ) {
+        add_action( 'advanced_mode_layout_after_content', 'advanced_mode_default_sided_sidebar' );
+    } else if ( is_ic_default_theme_sidebar_active() ) {
+        add_action( 'advanced_mode_layout_end', 'advanced_mode_default_sidebar' );
+    }
 }
 
@@ -1027 +1027 @@
  */
 function advanced_mode_default_sidebar() {
-    get_sidebar();
+    get_sidebar();
 }
 
@@ -1034 +1034 @@
  */
 function advanced_mode_default_sided_sidebar() {
-    $sidebar_id = apply_filters( 'catalog_default_sidebar_id', 'catalog_sidebar' );
-    $class      = apply_filters( 'catalog_default_sidebar_class', 'catalog_sidebar' );
-    echo '<div id="' . $sidebar_id . '" class="' . $class . '" role="complementary">';
-    $first_sidebar = ic_get_theme_primary_sidebar();
-    dynamic_sidebar( $first_sidebar );
-    echo '</div>';
+    $sidebar_id = apply_filters( 'catalog_default_sidebar_id', 'catalog_sidebar' );
+    $class      = apply_filters( 'catalog_default_sidebar_class', 'catalog_sidebar' );
+    echo '<div id="' . $sidebar_id . '" class="' . $class . '" role="complementary">';
+    $first_sidebar = ic_get_theme_primary_sidebar();
+    dynamic_sidebar( $first_sidebar );
+    echo '</div>';
 }
 
 function ic_get_theme_primary_sidebar() {
-    $registered_sidebars = $GLOBALS['wp_registered_sidebars'];
-    unset( $registered_sidebars['product_sort_bar'] );
-    foreach ( $registered_sidebars as $sidebar_name => $sidebar ) {
-        if ( ic_string_contains( $sidebar['name'], 'primary' ) || ic_string_contains( $sidebar['name'], 'Primary' ) ) {
-            $first_sidebar = $sidebar_name;
-            break;
-        }
-    }
-    if ( ! isset( $first_sidebar ) ) {
-        reset( $registered_sidebars );
-        $first_sidebar = key( $registered_sidebars );
-    }
-
-    return apply_filters( 'advanced_mode_sidebar_name', $first_sidebar, $registered_sidebars );
+    $registered_sidebars = $GLOBALS['wp_registered_sidebars'];
+    unset( $registered_sidebars['product_sort_bar'] );
+    foreach ( $registered_sidebars as $sidebar_name => $sidebar ) {
+        if ( ic_string_contains( $sidebar['name'], 'primary' ) || ic_string_contains( $sidebar['name'], 'Primary' ) ) {
+            $first_sidebar = $sidebar_name;
+            break;
+        }
+    }
+    if ( ! isset( $first_sidebar ) ) {
+        reset( $registered_sidebars );
+        $first_sidebar = key( $registered_sidebars );
+    }
+
+    return apply_filters( 'advanced_mode_sidebar_name', $first_sidebar, $registered_sidebars );
 }
 
@@ -1069 +1069 @@
  */
 function get_related_products( $products_limit = null, $markup = false, $product_id = null ) {
-    if ( ! isset( $products_limit ) ) {
-        $products_limit = apply_filters( 'related_products_count', get_current_per_row() );
-    }
-    if ( ! empty( $product_id ) ) {
-        $current_product_id = intval( $product_id );
-    }
-    if ( empty( $current_product_id ) ) {
-        $current_product_id = ic_get_product_id();
-    }
-    $taxonomy  = apply_filters( 'ic_cat_related_products_tax', get_current_screen_tax() );
-    $post_type = get_current_screen_post_type();
-    $terms     = ic_get_product_categories( $current_product_id );
-    if ( is_array( $terms ) && ! empty( $taxonomy ) && ! empty( $post_type ) ) {
-        $terms = apply_filters( 'ic_catalog_related_product_terms', array_reverse( $terms ), $current_product_id );
-        //$archive_template  = get_product_listing_template();
-        $i = 0;
-        //$inside                = '';
-        $products = array();
-        foreach ( $terms as $term ) {
-            $query_param = array(
-                'post_type'      => $post_type,
-                'orderby'        => 'rand',
-                'tax_query'      => array(
-                    array(
-                        'taxonomy' => $taxonomy,
-                        'field'    => 'slug',
-                        'terms'    => $term->slug,
-                    ),
-                ),
-                'posts_per_page' => $products_limit * 2,
-            );
-            $query       = new WP_Query( $query_param );
-            while ( $query->have_posts() ) : $query->the_post();
-                global $post;
-                if ( $current_product_id != $post->ID ) {
-                    $i ++;
-                    $products[] = $post->ID;
-                }
-                if ( $i >= $products_limit ) {
-                    break;
-                }
-                //ic_delete_global( 'product_id' );
-            endwhile;
-            wp_reset_postdata();
-            reset_row_class();
-            if ( $i >= $products_limit ) {
-                break;
-            }
-        }
-        $div = '';
-        if ( ! empty( $products ) ) {
-            $products = apply_filters( 'ic_cat_related_products', implode( ',', $products ), $products_limit );
-            ic_save_global( 'current_related_products', $products );
-            remove_filter( 'shortcode_query', 'set_shortcode_product_order', 10, 2 );
-            if ( $markup ) {
-                ob_start();
-                ic_show_template_file( 'product-page/related-products.php' );
-                $div = ob_get_clean();
-            } else {
-                $div = do_shortcode( '[show_products post_type="' . $post_type . '" product="' . $products . '"]' );
-            }
-            add_filter( 'shortcode_query', 'set_shortcode_product_order', 10, 2 );
-        }
-
-        return $div;
-    }
-
-    return;
+    if ( ! isset( $products_limit ) ) {
+        $products_limit = apply_filters( 'related_products_count', get_current_per_row() );
+    }
+    if ( ! empty( $product_id ) ) {
+        $current_product_id = intval( $product_id );
+    }
+    if ( empty( $current_product_id ) ) {
+        $current_product_id = ic_get_product_id();
+    }
+    $taxonomy  = apply_filters( 'ic_cat_related_products_tax', get_current_screen_tax() );
+    $post_type = get_current_screen_post_type();
+    $terms     = ic_get_product_categories( $current_product_id );
+    if ( is_array( $terms ) && ! empty( $taxonomy ) && ! empty( $post_type ) ) {
+        $terms = apply_filters( 'ic_catalog_related_product_terms', array_reverse( $terms ), $current_product_id );
+        //$archive_template  = get_product_listing_template();
+        $i = 0;
+        //$inside                = '';
+        $products = array();
+        foreach ( $terms as $term ) {
+            $query_param = array(
+                    'post_type'      => $post_type,
+                    'orderby'        => 'rand',
+                    'tax_query'      => array(
+                            array(
+                                    'taxonomy' => $taxonomy,
+                                    'field'    => 'slug',
+                                    'terms'    => $term->slug,
+                            ),
+                    ),
+                    'posts_per_page' => $products_limit * 2,
+            );
+            $query       = new WP_Query( $query_param );
+            while ( $query->have_posts() ) : $query->the_post();
+                global $post;
+                if ( $current_product_id != $post->ID ) {
+                    $i ++;
+                    $products[] = $post->ID;
+                }
+                if ( $i >= $products_limit ) {
+                    break;
+                }
+                //ic_delete_global( 'product_id' );
+            endwhile;
+            wp_reset_postdata();
+            reset_row_class();
+            if ( $i >= $products_limit ) {
+                break;
+            }
+        }
+        $div = '';
+        if ( ! empty( $products ) ) {
+            $products = apply_filters( 'ic_cat_related_products', implode( ',', $products ), $products_limit );
+            ic_save_global( 'current_related_products', $products );
+            remove_filter( 'shortcode_query', 'set_shortcode_product_order', 10, 2 );
+            if ( $markup ) {
+                ob_start();
+                ic_show_template_file( 'product-page/related-products.php' );
+                $div = ob_get_clean();
+            } else {
+                $div = do_shortcode( '[show_products post_type="' . $post_type . '" product="' . $products . '"]' );
+            }
+            add_filter( 'shortcode_query', 'set_shortcode_product_order', 10, 2 );
+        }
+
+        return $div;
+    }
+
+    return;
 }
 
 function ic_get_product_categories( $product_id, $taxonomy = null, $args = null ) {
-    if ( empty( $taxonomy ) ) {
-        $taxonomy = apply_filters( 'ic_cat_related_products_tax', get_current_screen_tax() );
-    }
-    $terms = get_the_terms( $product_id, $taxonomy );
-
-    return $terms;
+    if ( empty( $taxonomy ) ) {
+        $taxonomy = apply_filters( 'ic_cat_related_products_tax', get_current_screen_tax() );
+    }
+    $terms = get_the_terms( $product_id, $taxonomy );
+
+    return $terms;
 }
 
@@ -1156 +1156 @@
  */
 function ic_add_product_category_image( $term_id ) {
-    if ( is_ic_category_image_enabled() ) {
-        ic_save_global( 'current_product_category_id', $term_id );
-        ic_show_template_file( 'product-listing/category-image.php' );
-    }
+    if ( is_ic_category_image_enabled() ) {
+        ic_save_global( 'current_product_category_id', $term_id );
+        ic_show_template_file( 'product-listing/category-image.php' );
+    }
 }
 
@@ -1169 +1169 @@
  */
 function ic_add_product_category_description() {
-    add_filter( 'ic_product_cat_desc', 'wptexturize' );
-    add_filter( 'ic_product_cat_desc', 'convert_smilies' );
-    add_filter( 'ic_product_cat_desc', 'convert_chars' );
-    add_filter( 'ic_product_cat_desc', 'wpautop' );
-    add_filter( 'ic_product_cat_desc', 'shortcode_unautop' );
-    add_filter( 'ic_product_cat_desc', 'do_shortcode', 11 );
-    ic_show_template_file( 'product-listing/category-description.php' );
+    add_filter( 'ic_product_cat_desc', 'wptexturize' );
+    add_filter( 'ic_product_cat_desc', 'convert_smilies' );
+    add_filter( 'ic_product_cat_desc', 'convert_chars' );
+    add_filter( 'ic_product_cat_desc', 'wpautop' );
+    add_filter( 'ic_product_cat_desc', 'shortcode_unautop' );
+    add_filter( 'ic_product_cat_desc', 'do_shortcode', 11 );
+    ic_show_template_file( 'product-listing/category-description.php' );
 }
 
@@ -1187 +1187 @@
  */
 function ic_product_listing_categories( $archive_template, $multiple_settings ) {
-    $taxonomy_name = apply_filters( 'current_product_catalog_taxonomy', 'al_product-cat' );
-    if ( ! is_tax() && ! is_search() ) {
-        $before_archive = content_product_adder_archive_before();
-        if ( $before_archive != '<div class="entry-summary"></div>' ) {
-            echo $before_archive;
-        }
-        if ( $multiple_settings['product_listing_cats'] == 'on' || $multiple_settings['product_listing_cats'] == 'cats_only' || $multiple_settings['product_listing_cats'] == 'forced_cats_only' ) {
-
-            if ( $multiple_settings['cat_template'] != 'template' ) {
-                $product_subcategories = wp_list_categories( 'show_option_none=No_cat&echo=0&title_li=&taxonomy=' . $taxonomy_name . '&parent=0' );
-                if ( ! strpos( $product_subcategories, 'No_cat' ) ) {
-                    do_action( 'before_product_listing_category_list' );
-                    ic_save_global( 'current_product_categories', $product_subcategories );
-                    ic_save_global( 'current_product_archive_template', get_product_listing_template() );
-                    ic_show_template_file( 'product-listing/categories-listing.php' );
-                }
-            } else {
-                $show_categories = do_shortcode( '[show_categories parent="0" shortcode_query="no"]' );
-                if ( ! empty( $show_categories ) ) {
-                    do_action( 'before_product_listing_category_list' );
-                    echo $show_categories;
-                    if ( $archive_template != 'list' && more_products() && $multiple_settings['product_listing_cats'] !== 'forced_cats_only'/* && !is_ic_only_main_cats() */ ) {
-                        echo '<hr>';
-                    }
-                }
-            }
-        }
-    } else if ( is_tax() ) {
-        $term = ic_get_queried_object();
-        if ( empty( $term->term_id ) ) {
-            return;
-        }
-        if ( current_filter() === 'product_listing_entry_inside' ) {
-            if ( has_shortcode( $term->description, 'product_listing_products' ) ) {
-                remove_action( 'product_listing_entry_inside', 'ic_product_listing_products', 20, 2 );
-                add_action( 'after_product_list', 'product_archive_pagination', 99, 0 );
-                remove_action( 'product_listing_end', 'product_archive_pagination' );
-            }
-            do_action( 'product_category_page_start', $term->term_id );
-
-            if ( has_shortcode( $term->description, 'product_listing_categories' ) ) {
-                return;
-            }
-        }
-        if ( $multiple_settings['category_top_cats'] == 'on' || $multiple_settings['category_top_cats'] == 'only_subcategories' ) {
-            if ( $multiple_settings['cat_template'] != 'template' ) {
-                $product_subcategories = wp_list_categories( 'show_option_none=No_cat&echo=0&title_li=&taxonomy=' . $taxonomy_name . '&child_of=' . $term->term_id );
-                if ( ! strpos( $product_subcategories, 'No_cat' ) ) {
-                    do_action( 'before_category_subcategories' );
-                    ic_save_global( 'current_product_categories', $product_subcategories );
-                    ic_save_global( 'current_product_archive_template', get_product_listing_template() );
-                    ic_show_template_file( 'product-listing/categories-listing.php' );
-                }
-            } else {
-                $show_categories = do_shortcode( '[show_categories parent=' . get_queried_object_id() . ' shortcode_query=no]' );
-                if ( ! empty( $show_categories ) ) {
-                    do_action( 'before_category_subcategories' );
-                    echo $show_categories;
-                    if ( $archive_template != 'list' && more_products() /* && !is_ic_only_main_cats() */ ) {
-                        echo '<hr>';
-                    }
-                }
-            }
-        }
-    }
+    $taxonomy_name = apply_filters( 'current_product_catalog_taxonomy', 'al_product-cat' );
+    if ( ! is_tax() && ! is_search() ) {
+        $before_archive = content_product_adder_archive_before();
+        if ( $before_archive != '<div class="entry-summary"></div>' ) {
+            echo $before_archive;
+        }
+        if ( $multiple_settings['product_listing_cats'] == 'on' || $multiple_settings['product_listing_cats'] == 'cats_only' || $multiple_settings['product_listing_cats'] == 'forced_cats_only' ) {
+
+            if ( $multiple_settings['cat_template'] != 'template' ) {
+                $product_subcategories = wp_list_categories( 'show_option_none=No_cat&echo=0&title_li=&taxonomy=' . $taxonomy_name . '&parent=0' );
+                if ( ! strpos( $product_subcategories, 'No_cat' ) ) {
+                    do_action( 'before_product_listing_category_list' );
+                    ic_save_global( 'current_product_categories', $product_subcategories );
+                    ic_save_global( 'current_product_archive_template', get_product_listing_template() );
+                    ic_show_template_file( 'product-listing/categories-listing.php' );
+                }
+            } else {
+                $show_categories = do_shortcode( '[show_categories parent="0" shortcode_query="no"]' );
+                if ( ! empty( $show_categories ) ) {
+                    do_action( 'before_product_listing_category_list' );
+                    echo $show_categories;
+                    if ( $archive_template != 'list' && more_products() && $multiple_settings['product_listing_cats'] !== 'forced_cats_only'/* && !is_ic_only_main_cats() */ ) {
+                        echo '<hr>';
+                    }
+                }
+            }
+        }
+    } else if ( is_tax() ) {
+        $term = ic_get_queried_object();
+        if ( empty( $term->term_id ) ) {
+            return;
+        }
+        if ( current_filter() === 'product_listing_entry_inside' ) {
+            if ( has_shortcode( $term->description, 'product_listing_products' ) ) {
+                remove_action( 'product_listing_entry_inside', 'ic_product_listing_products', 20, 2 );
+                add_action( 'after_product_list', 'product_archive_pagination', 99, 0 );
+                remove_action( 'product_listing_end', 'product_archive_pagination' );
+            }
+            do_action( 'product_category_page_start', $term->term_id );
+
+            if ( has_shortcode( $term->description, 'product_listing_categories' ) ) {
+                return;
+            }
+        }
+        if ( $multiple_settings['category_top_cats'] == 'on' || $multiple_settings['category_top_cats'] == 'only_subcategories' ) {
+            if ( $multiple_settings['cat_template'] != 'template' ) {
+                $product_subcategories = wp_list_categories( 'show_option_none=No_cat&echo=0&title_li=&taxonomy=' . $taxonomy_name . '&child_of=' . $term->term_id );
+                if ( ! strpos( $product_subcategories, 'No_cat' ) ) {
+                    do_action( 'before_category_subcategories' );
+                    ic_save_global( 'current_product_categories', $product_subcategories );
+                    ic_save_global( 'current_product_archive_template', get_product_listing_template() );
+                    ic_show_template_file( 'product-listing/categories-listing.php' );
+                }
+            } else {
+                $show_categories = do_shortcode( '[show_categories parent=' . get_queried_object_id() . ' shortcode_query=no]' );
+                if ( ! empty( $show_categories ) ) {
+                    do_action( 'before_category_subcategories' );
+                    echo $show_categories;
+                    if ( $archive_template != 'list' && more_products() /* && !is_ic_only_main_cats() */ ) {
+                        echo '<hr>';
+                    }
+                }
+            }
+        }
+    }
 }
 
@@ -1263 +1263 @@
  */
 function ic_product_listing_products( $archive_template, $multiple_settings ) {
-    global $ic_is_home;
-    if ( ! is_ic_ajax() && ( is_ic_product_listing() || ! is_ic_catalog_page() ) && $multiple_settings['product_listing_cats'] == 'forced_cats_only' ) {
-        return;
-    }
-
-    if ( is_home_archive() || ( ! more_products() && ( is_custom_product_listing_page() || ( ! is_ic_catalog_page() && ic_get_global( 'inside_show_catalog_shortcode' ) && ! is_ic_only_main_cats() ) ) ) ) {
-        $catalog_query = ic_set_home_listing_query();
-        if ( ! empty( $catalog_query ) ) {
-            global $wp_query;
-            $wp_query = $catalog_query;
-
-        }
-        $ic_is_home = 1;
-    }
-    global $wp_query;
-    if ( /* (!is_ic_only_main_cats() || is_search() || is_product_filters_active() || is_ic_ajax() ) && */ more_products() ) {
-        do_action( 'before_product_list', $archive_template, $multiple_settings );
-        $product_list = '';
-        while ( have_posts() ) : the_post();
-            $post = get_post();
-            if ( empty( $post->ID ) ) {
-
-                continue;
-            }
-            ic_set_product_id( $post->ID );
-            $product_list .= get_catalog_template( $archive_template, $post );
-            ic_reset_product_id();
-        endwhile;
-        $product_list = apply_filters( 'product_list_ready', $product_list, $archive_template, 'auto_listing' );
-        echo '<div class="product-list ' . $archive_template . ' ' . product_list_class( $archive_template ) . '" ' . product_list_attr() . '>' . $product_list . '</div>';
-        do_action( 'after_product_list', $archive_template, $multiple_settings );
-        add_action( 'product_listing_end', 'ic_product_clear_span', 99 );
-    } else if ( ( ! is_product_filters_active() && is_search() ) && ! more_products() ) {
-        do_action( 'ic_before_empty_search', $archive_template, $multiple_settings );
-        ob_start();
-        $notfound_text = __( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'ecommerce-product-catalog' );
-        echo '<div class="product-list ' . product_list_class( $archive_template ) . '"><p>' . apply_filters( 'ic_catalog_not_found_message', $notfound_text ) . '</p></div>';
-        product_search_form();
-        echo apply_filters( 'ic_catalog_not_found_content', ob_get_clean() );
-    } else if ( is_product_filters_active() && ! more_products() ) {
-        show_product_sort_bar();
-        $notfound_filters_text = sprintf( __( 'Sorry, but nothing matched your search terms. Please try again with some different options or %sreset filters%s.', 'ecommerce-product-catalog' ), '<a href="' . esc_url( get_filters_bar_reset_url() ) . '">', '</a>' );
-        echo '<div class="product-list ' . product_list_class( $archive_template ) . '"><p>' . apply_filters( 'ic_catalog_not_found_filters_message', $notfound_filters_text ) . '</p></div>';
-    } else if ( ! more_products() && ! ic_is_rendering_catalog_block() && ! is_ic_admin() && ( ! is_ic_only_main_cats() || ( is_ic_taxonomy_page() && ! has_category_children() ) ) ) {
-        echo ic_empty_list_text();
-    }
+    global $ic_is_home;
+    if ( ! is_ic_ajax() && ( is_ic_product_listing() || ! is_ic_catalog_page() ) && $multiple_settings['product_listing_cats'] == 'forced_cats_only' ) {
+        return;
+    }
+
+    if ( is_home_archive() || ( ! more_products() && ( is_custom_product_listing_page() || ( ! is_ic_catalog_page() && ic_get_global( 'inside_show_catalog_shortcode' ) && ! is_ic_only_main_cats() ) ) ) ) {
+        $catalog_query = ic_set_home_listing_query();
+        if ( ! empty( $catalog_query ) ) {
+            global $wp_query;
+            $wp_query = $catalog_query;
+
+        }
+        $ic_is_home = 1;
+    }
+    global $wp_query;
+    if ( /* (!is_ic_only_main_cats() || is_search() || is_product_filters_active() || is_ic_ajax() ) && */ more_products() ) {
+        do_action( 'before_product_list', $archive_template, $multiple_settings );
+        $product_list = '';
+        while ( have_posts() ) : the_post();
+            $post = get_post();
+            if ( empty( $post->ID ) ) {
+
+                continue;
+            }
+            ic_set_product_id( $post->ID );
+            $product_list .= get_catalog_template( $archive_template, $post );
+            ic_reset_product_id();
+        endwhile;
+        $product_list = apply_filters( 'product_list_ready', $product_list, $archive_template, 'auto_listing' );
+        echo '<div class="product-list ' . $archive_template . ' ' . product_list_class( $archive_template ) . '" ' . product_list_attr() . '>' . $product_list . '</div>';
+        do_action( 'after_product_list', $archive_template, $multiple_settings );
+        add_action( 'product_listing_end', 'ic_product_clear_span', 99 );
+    } else if ( ( ! is_product_filters_active() && is_search() ) && ! more_products() ) {
+        do_action( 'ic_before_empty_search', $archive_template, $multiple_settings );
+        ob_start();
+        $notfound_text = __( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'ecommerce-product-catalog' );
+        echo '<div class="product-list ' . product_list_class( $archive_template ) . '"><p>' . apply_filters( 'ic_catalog_not_found_message', $notfound_text ) . '</p></div>';
+        product_search_form();
+        echo apply_filters( 'ic_catalog_not_found_content', ob_get_clean() );
+    } else if ( is_product_filters_active() && ! more_products() ) {
+        show_product_sort_bar();
+        $notfound_filters_text = sprintf( __( 'Sorry, but nothing matched your search terms. Please try again with some different options or %sreset filters%s.', 'ecommerce-product-catalog' ), '<a href="' . esc_url( get_filters_bar_reset_url() ) . '">', '</a>' );
+        echo '<div class="product-list ' . product_list_class( $archive_template ) . '"><p>' . apply_filters( 'ic_catalog_not_found_filters_message', $notfound_filters_text ) . '</p></div>';
+    } else if ( ! more_products() && ! ic_is_rendering_catalog_block() && ! is_ic_admin() && ( ! is_ic_only_main_cats() || ( is_ic_taxonomy_page() && ! has_category_children() ) ) ) {
+        echo ic_empty_list_text();
+    }
 
 }
 
 function ic_home_listing_query_args() {
-    $args = ic_get_global( 'home_listing_query_args' );
-    if ( $args !== false ) {
-        return $args;
-    }
-    $multiple_settings = get_multiple_settings();
-    if ( get_query_var( 'paged' ) ) {
-        $paged = get_query_var( 'paged' );
-    } elseif ( get_query_var( 'page' ) ) {
-        $paged = get_query_var( 'page' );
-    } else {
-        $paged = 1;
-    }
-    $args = apply_filters( 'home_product_listing_query', array(
-        'post_status'    => ic_visible_product_status(),
-        'post_type'      => 'al_product',
-        'posts_per_page' => isset( $multiple_settings['archive_products_limit'] ) ? $multiple_settings['archive_products_limit'] : 12,
-        'paged'          => $paged
-    ) );
-    ic_save_global( 'home_listing_query_args', $args );
-
-    return $args;
+    $args = ic_get_global( 'home_listing_query_args' );
+    if ( $args !== false ) {
+        return $args;
+    }
+    $multiple_settings = get_multiple_settings();
+    if ( get_query_var( 'paged' ) ) {
+        $paged = get_query_var( 'paged' );
+    } elseif ( get_query_var( 'page' ) ) {
+        $paged = get_query_var( 'page' );
+    } else {
+        $paged = 1;
+    }
+    $args = apply_filters( 'home_product_listing_query', array(
+            'post_status'    => ic_visible_product_status(),
+            'post_type'      => 'al_product',
+            'posts_per_page' => isset( $multiple_settings['archive_products_limit'] ) ? $multiple_settings['archive_products_limit'] : 12,
+            'paged'          => $paged
+    ) );
+    ic_save_global( 'home_listing_query_args', $args );
+
+    return $args;
 }
 
 function ic_set_home_listing_query() {
-    $args = ic_home_listing_query_args();
-    if ( ! empty( $args ) ) {
-        $catalog_query = apply_filters( 'ic_home_query', '', $args );
-        if ( empty( $catalog_query ) ) {
-            $cache_meta    = 'ic_home_listing_query_' . serialize( array_values( $args ) );
-            $catalog_query = ic_get_global( $cache_meta );
-            if ( $catalog_query !== false ) {
-                return $catalog_query;
-            }
-            do_action( 'ic_before_home_listing_query' );
-            $catalog_query = new WP_Query( $args );
-            do_action( 'ic_after_home_listing_query' );
-
-            if ( ! empty( $args['is_archive'] ) ) {
-                $catalog_query->is_post_type_archive = true;
-            }
-            ic_save_global( $cache_meta, $catalog_query );
-        }
-
-        return $catalog_query;
-    }
-
-    return false;
+    $args = ic_home_listing_query_args();
+    if ( ! empty( $args ) ) {
+        $catalog_query = apply_filters( 'ic_home_query', '', $args );
+        if ( empty( $catalog_query ) ) {
+            $cache_meta    = 'ic_home_listing_query_' . serialize( array_values( $args ) );
+            $catalog_query = ic_get_global( $cache_meta );
+            if ( $catalog_query !== false ) {
+                return $catalog_query;
+            }
+            do_action( 'ic_before_home_listing_query' );
+            $catalog_query = new WP_Query( $args );
+            do_action( 'ic_after_home_listing_query' );
+
+            if ( ! empty( $args['is_archive'] ) ) {
+                $catalog_query->is_post_type_archive = true;
+            }
+            ic_save_global( $cache_meta, $catalog_query );
+        }
+
+        return $catalog_query;
+    }
+
+    return false;
 }
 
 function ic_product_clear_span() {
-    ?>
+    ?>
     <span class="clear"></span>
-    <?php
+    <?php
 
 }
@@ -1377 +1377 @@
  */
 function ic_reset_home_listing_query() {
-    global $ic_is_home;
-    if ( isset( $ic_is_home ) && $ic_is_home == 1 ) {
-        wp_reset_query();
-    }
+    global $ic_is_home;
+    if ( isset( $ic_is_home ) && $ic_is_home == 1 ) {
+        wp_reset_query();
+    }
 }
 
@@ -1386 +1386 @@
 
 function ic_catalog_page_body_class( $classes ) {
-    if ( is_ic_catalog_page() ) {
-        $classes[] = 'ecommerce-product-catalog';
-        if ( ! is_ic_theme_mode() ) {
-            $classes[]     = 'type-page';
-            $classes[]     = 'page';
-            $listing_id    = intval( get_product_listing_id() );
-            $template_slug = apply_filters( 'ic_catalog_page_template', get_page_template_slug( $listing_id ) );
-            if ( ! empty( $template_slug ) ) {
-                $classes[]      = "page-template";
-                $template_parts = explode( '/', $template_slug );
-                foreach ( $template_parts as $part ) {
-                    $classes[] = "page-template-" . sanitize_html_class( str_replace( array(
-                            '.',
-                            '/'
-                        ), '-', basename( $part, '.php' ) ) );
-                }
-                $classes[] = "page-template-" . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
-            } else {
-                $classes[] = "page-template-default";
-            }
-        }
-    }
-
-    return $classes;
+    if ( is_ic_catalog_page() ) {
+        $classes[] = 'ecommerce-product-catalog';
+        if ( is_ic_product_listing() ) {
+            $classes[] = 'main-catalog-page';
+        }
+        if ( ! is_ic_theme_mode() ) {
+            $classes[]     = 'type-page';
+            $classes[]     = 'page';
+            $listing_id    = intval( get_product_listing_id() );
+            $template_slug = apply_filters( 'ic_catalog_page_template', get_page_template_slug( $listing_id ) );
+            if ( ! empty( $template_slug ) ) {
+                $classes[]      = "page-template";
+                $template_parts = explode( '/', $template_slug );
+                foreach ( $template_parts as $part ) {
+                    $classes[] = "page-template-" . sanitize_html_class( str_replace( array(
+                                    '.',
+                                    '/'
+                            ), '-', basename( $part, '.php' ) ) );
+                }
+                $classes[] = "page-template-" . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
+            } else {
+                $classes[] = "page-template-default";
+            }
+        }
+    }
+
+    return $classes;
 }
 
@@ -1415 +1418 @@
 
 function ic_catalog_product_page_body_class( $body_class ) {
-    $product_id   = ic_get_product_id();
-    $body_class[] = 'single-product-page';
-    $terms        = wp_get_post_terms( $product_id, 'al_product-cat', array( "fields" => "ids", "orderby" => "none" ) );
-    if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
-        foreach ( $terms as $term_id ) {
-            $body_class[] = 'product-category-' . $term_id;
-            $parent_terms = ic_get_parent_terms( $term_id );
-            if ( ! empty( $parent_terms ) ) {
-                foreach ( $parent_terms as $parent_term_id ) {
-                    $body_class[] = 'parent-product-category-' . $parent_term_id;
-                }
-            }
-        }
-    }
-
-    return $body_class;
+    $product_id   = ic_get_product_id();
+    $body_class[] = 'single-product-page';
+    $terms        = wp_get_post_terms( $product_id, 'al_product-cat', array( "fields" => "ids", "orderby" => "none" ) );
+    if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
+        foreach ( $terms as $term_id ) {
+            $body_class[] = 'product-category-' . $term_id;
+            $parent_terms = ic_get_parent_terms( $term_id );
+            if ( ! empty( $parent_terms ) ) {
+                foreach ( $parent_terms as $parent_term_id ) {
+                    $body_class[] = 'parent-product-category-' . $parent_term_id;
+                }
+            }
+        }
+    }
+
+    return $body_class;
 }
 
@@ -1436 +1439 @@
 
 function ic_catalog_product_category_body_class( $body_class ) {
-    $term_id = ic_get_current_category_id();
-    if ( empty( $term_id ) ) {
-        return $body_class;
-    }
-    $term = get_term( $term_id );
-    if ( ! is_wp_error( $term ) ) {
-        $body_class[] = 'product-category-page';
-        $body_class[] = 'product-category-page-' . $term_id;
-    }
-    if ( ! empty( $term->parent ) ) {
-        $terms = array( $term->parent );
-        foreach ( $terms as $term_id ) {
-            $body_class[] = 'product-category-page-parent-' . $term_id;
-            $parent_terms = ic_get_parent_terms( $term_id );
-            if ( ! empty( $parent_terms ) ) {
-                foreach ( $parent_terms as $parent_term_id ) {
-                    $body_class[] = 'product-category-page-parent-' . $parent_term_id;
-                }
-            }
-        }
-    }
-
-    return $body_class;
+    $term_id = ic_get_current_category_id();
+    if ( empty( $term_id ) ) {
+        return $body_class;
+    }
+    $term = get_term( $term_id );
+    if ( ! is_wp_error( $term ) ) {
+        $body_class[] = 'product-category-page';
+        $body_class[] = 'product-category-page-' . $term_id;
+    }
+    if ( ! empty( $term->parent ) ) {
+        $terms = array( $term->parent );
+        foreach ( $terms as $term_id ) {
+            $body_class[] = 'product-category-page-parent-' . $term_id;
+            $parent_terms = ic_get_parent_terms( $term_id );
+            if ( ! empty( $parent_terms ) ) {
+                foreach ( $parent_terms as $parent_term_id ) {
+                    $body_class[] = 'product-category-page-parent-' . $parent_term_id;
+                }
+            }
+        }
+    }
+
+    return $body_class;
 }
 
 function ic_get_parent_terms( $term_id ) {
-    $term = get_term( $term_id );
-    if ( ! empty( $term->parent ) ) {
-        $term_ids    = array( $term->parent );
-        $parent_term = ic_get_parent_terms( $term->parent );
-        if ( ! empty( $parent_term ) ) {
-            $term_ids = array_merge( $term_ids, $parent_term );
-        }
-
-        return array_unique( $term_ids );
-    }
-
-    return array();
+    $term = get_term( $term_id );
+    if ( ! empty( $term->parent ) ) {
+        $term_ids    = array( $term->parent );
+        $parent_term = ic_get_parent_terms( $term->parent );
+        if ( ! empty( $parent_term ) ) {
+            $term_ids = array_merge( $term_ids, $parent_term );
+        }
+
+        return array_unique( $term_ids );
+    }
+
+    return array();
 }
 
 if ( ! function_exists( 'ic_get_template_file' ) ) {
 
-    /**
-     * Manages template files paths
-     *
-     * @param type $file_path
-     *
-     * @return type
-     */
-    function ic_get_template_file( $file_path, $base_path = AL_BASE_TEMPLATES_PATH, $product_id = false ) {
-        if ( empty( $base_path ) ) {
-            $base_path = AL_BASE_TEMPLATES_PATH;
-        }
-        $folder    = get_custom_templates_folder();
-        $file_path = apply_filters( 'ic_template_file_path', $file_path, $product_id );
-        $base_path = apply_filters( 'ic_template_file_base_path', $base_path, $file_path );
-        $file_name = basename( $file_path );
-        if ( file_exists( $folder . $file_name ) ) {
-            return $folder . $file_name;
-        } else if ( file_exists( $base_path . '/templates/template-parts/' . $file_path ) ) {
-            return $base_path . '/templates/template-parts/' . $file_path;
-        } else {
-            return false;
-        }
-    }
+    /**
+     * Manages template files paths
+     *
+     * @param type $file_path
+     *
+     * @return type
+     */
+    function ic_get_template_file( $file_path, $base_path = AL_BASE_TEMPLATES_PATH, $product_id = false ) {
+        if ( empty( $base_path ) ) {
+            $base_path = AL_BASE_TEMPLATES_PATH;
+        }
+        $folder    = get_custom_templates_folder();
+        $file_path = apply_filters( 'ic_template_file_path', $file_path, $product_id );
+        $base_path = apply_filters( 'ic_template_file_base_path', $base_path, $file_path );
+        $file_name = basename( $file_path );
+        if ( file_exists( $folder . $file_name ) ) {
+            return $folder . $file_name;
+        } else if ( file_exists( $base_path . '/templates/template-parts/' . $file_path ) ) {
+            return $base_path . '/templates/template-parts/' . $file_path;
+        } else {
+            return false;
+        }
+    }
 
 }
@@ -1506 +1509 @@
 if ( ! function_exists( 'ic_show_template_file' ) ) {
 
-    /**
-     * Includes template file
-     *
-     * @param type $file_path
-     *
-     * @return type
-     */
-    function ic_show_template_file( $file_path, $base_path = AL_BASE_TEMPLATES_PATH, $product_id = false ) {
-        $path = ic_get_template_file( $file_path, $base_path, $product_id );
-        if ( $path ) {
-            ic_enqueue_main_catalog_js_css();
-            if ( $product_id ) {
-                $prev_id = ic_get_global( 'product_id' );
-                if ( $prev_id !== $product_id && is_ic_product( $product_id ) ) {
-                    ic_save_global( 'product_id', $product_id, false, false, true );
-                }
-            }
-            include $path;
-            if ( $product_id && isset( $prev_id ) ) {
-                //$prev_id = isset( $prev_id ) ? $prev_id : null;
-                if ( $prev_id && $prev_id !== $product_id && is_ic_product( $prev_id ) ) {
-                    ic_save_global( 'product_id', $prev_id, false, false, true );
-                } else if ( $prev_id === false ) {
-                    ic_delete_global( 'product_id' );
-                }
-            }
-        }
-
-        return;
-    }
+    /**
+     * Includes template file
+     *
+     * @param type $file_path
+     *
+     * @return type
+     */
+    function ic_show_template_file( $file_path, $base_path = AL_BASE_TEMPLATES_PATH, $product_id = false ) {
+        $path = ic_get_template_file( $file_path, $base_path, $product_id );
+        if ( $path ) {
+            ic_enqueue_main_catalog_js_css();
+            if ( $product_id ) {
+                $prev_id = ic_get_global( 'product_id' );
+                if ( $prev_id !== $product_id && is_ic_product( $product_id ) ) {
+                    ic_save_global( 'product_id', $product_id, false, false, true );
+                }
+            }
+            include $path;
+            if ( $product_id && isset( $prev_id ) ) {
+                //$prev_id = isset( $prev_id ) ? $prev_id : null;
+                if ( $prev_id && $prev_id !== $product_id && is_ic_product( $prev_id ) ) {
+                    ic_save_global( 'product_id', $prev_id, false, false, true );
+                } else if ( $prev_id === false ) {
+                    ic_delete_global( 'product_id' );
+                }
+            }
+        }
+
+        return;
+    }
 
 }
@@ -1542 +1545 @@
 
 function ic_catalog_archive_title( $title ) {
-    if ( is_ic_taxonomy_page() ) {
-        $title = single_term_title( '', false );
-    } else if ( is_ic_product_listing() ) {
-        $title = post_type_archive_title( '', false );
-    }
-
-    return $title;
-}
+    if ( is_ic_taxonomy_page() ) {
+        $title = single_term_title( '', false );
+    } else if ( is_ic_product_listing() ) {
+        $title = post_type_archive_title( '', false );
+    }
+
+    return $title;
+}