fix: qa team feedback

Codeinwp · Jan 27, 2025 · 5daf52d · 5daf52d
1 parent 1275cb7
commit 5daf52d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/inc/compatibility/woocommerce.php b/inc/compatibility/woocommerce.php
@@ -284,7 +284,7 @@ public function register_hooks() {
 		add_action( 'admin_footer', array( $this, 'update_woo_width' ) );
 
 		// Wrap content.
-		if ( function_exists( 'elementor_theme_do_location' ) && elementor_theme_do_location( 'header' ) ) {
+		if ( function_exists( 'elementor_theme_do_location' ) && ( elementor_theme_do_location( 'header' ) ) ) {
 			add_action( 'woocommerce_before_main_content', array( $this, 'wrap_pages_start' ) );
 			add_action( 'woocommerce_after_main_content', array( $this, 'wrap_pages_end' ) );
 		} else {
@@ -543,6 +543,10 @@ public function wrap_pages_start() {
 		if ( ! is_woocommerce() ) {
 			return;
 		}
+
+		if ( doing_action( 'woocommerce_before_main_content' ) ) {
+			echo '<main id="content" class="neve-main">';
+		}
 		echo '<div class="' . esc_attr( apply_filters( 'neve_container_class_filter', 'container' ) ) . ' shop-container">';
 		echo '<div class="row">';
 	}
@@ -556,6 +560,9 @@ public function wrap_pages_end() {
 		}
 		$this->close_div();
 		$this->close_div();
+		if ( doing_action( 'neve_before_primary_end' ) ) {
+			$this->close_div();
+		}
 	}
 
 	/**

diff --git a/inc/customizer/defaults/layout.php b/inc/customizer/defaults/layout.php
@@ -46,7 +46,6 @@ private function sidebar_layout_width_default( $control_id ) {
 			'neve_blog_archive_content_width',
 			'neve_other_pages_content_width',
 			'neve_single_product_content_width',
-			'neve_shop_archive_content_width',
 		];
 		$full_width = apply_filters( 'neve_sidebar_full_width_defaults', $full_width );
 		if ( in_array( $control_id, $full_width, true ) ) {