Merge pull request #2878 from Codeinwp/fix/woo-builder

Small Woo Builder Fixes

Author: abaicus

plugins/otter-pro/inc/render/woocommerce/class-product-add-to-cart-block.php

@@ -26,13 +26,13 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
 			return;
 		}
+
+		ob_start();
 		woocommerce_template_single_add_to_cart();
 		$output = ob_get_clean();
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-images-block.php

@@ -26,8 +26,6 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
@@ -38,6 +36,7 @@ public function render( $attributes ) {
 			remove_action( 'woocommerce_product_thumbnails', 'woocommerce_show_product_thumbnails', 20 );
 		}
 
+		ob_start();
 		woocommerce_show_product_images();
 		woocommerce_show_product_sale_flash();
 

plugins/otter-pro/inc/render/woocommerce/class-product-meta-block.php

@@ -26,13 +26,13 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
 			return;
 		}
+
+		ob_start();
 		woocommerce_template_single_meta();
 		$output = ob_get_clean();
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-price-block.php

@@ -26,13 +26,13 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
 			return;
 		}
+
+		ob_start();
 		woocommerce_template_single_price();
 		$output = ob_get_clean();
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-rating-block.php

@@ -26,17 +26,21 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
+		$is_editor_preview = defined( 'REST_REQUEST' ) && REST_REQUEST;
 
 		global $product;
 
 		if ( ! $product ) {
-			return;
+			return $is_editor_preview ? __( 'Your product ratings will display here.', 'otter-pro' ) : '';
 		}
+
+		$show_placeholder = $is_editor_preview || current_user_can( 'edit_post', $product->get_id() );
+
+		ob_start();
 		woocommerce_template_single_rating();
 		$output = ob_get_clean();
 
-		if ( empty( $output ) ) {
+		if ( empty( $output ) && $show_placeholder ) {
 			$output = __( 'Your product ratings will display here.', 'otter-pro' );
 		}
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-related-products-block.php

@@ -26,13 +26,13 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
 			return;
 		}
+
+		ob_start();
 		woocommerce_output_related_products();
 		$output = ob_get_clean();
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-short-description-block.php

@@ -26,13 +26,13 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
 			return;
 		}
+
+		ob_start();
 		woocommerce_template_single_excerpt();
 		$output = ob_get_clean();
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-stock-block.php

@@ -26,14 +26,20 @@ public function render( $attributes ) {
 			return;
 		}
 
+
+		$is_editor_preview = defined( 'REST_REQUEST' ) && REST_REQUEST;
+
 		global $product;
 
 		if ( ! $product ) {
-			return;
+			return $is_editor_preview ? __( 'Your product stock will display here.', 'otter-pro' ) : '';
 		}
+
+		$show_placeholder = $is_editor_preview || current_user_can( 'edit_post', $product->get_id() );
+
 		$output = wc_get_stock_html( $product );
 
-		if ( empty( $output ) ) {
+		if ( empty( $output ) && $show_placeholder ) {
 			$output = __( 'Your product stock will display here.', 'otter-pro' );
 		}
 		return $output;

plugins/otter-pro/inc/render/woocommerce/class-product-tabs-block.php

@@ -26,8 +26,6 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
@@ -42,8 +40,10 @@ function ( $tabs ) {
 			} 
 		);
 
+		ob_start();
 		woocommerce_output_product_data_tabs();
 		$output = ob_get_clean();
+
 		return $output;
 	}
 }

plugins/otter-pro/inc/render/woocommerce/class-product-title-block.php

@@ -26,13 +26,13 @@ public function render( $attributes ) {
 			return;
 		}
 
-		ob_start();
-
 		global $product;
 
 		if ( ! $product ) {
 			return;
 		}
+
+		ob_start();
 		woocommerce_template_single_title();
 		$output = ob_get_clean();
 		return $output;