Addressing #24, #25

pootlepress · May 4, 2017 · 05cfae4 · 05cfae4
1 parent 9a17fda
commit 05cfae4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/README.txt b/README.txt
@@ -71,6 +71,12 @@ Edit the product, uncheck "Enable Product builder" checkbox above `Update` butto
 
 == Upgrade Notice ==
 
+= 1.0.0 =
+ * 2016-12-29
+ * Ready for the world
+
+== Changelog ==
+
 = 1.2.0 =
  * 2017-03-21
  * Fix - Content dumping in product content
@@ -82,11 +88,5 @@ Edit the product, uncheck "Enable Product builder" checkbox above `Update` butto
  * Fix - WooBuilder metabox showing on all post edit screens
  * Fix - Disabling WooBuilder shows ppb layout in description instead of long description
 
-= 1.0.0 =
- * 2016-12-29
- * Ready for the world
-
-== Changelog ==
-
 = 1.0.0 =
  * Ready for the world
diff --git a/inc/class-modules.php b/inc/class-modules.php
@@ -39,49 +39,49 @@ public function module( $mods ) {
 		$mods['ppb-product-add-to-cart']       = array(
 			'label'       => 'WC - Add to Cart Button',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_a2c',
 			'ActiveClass' => $this->class,
 		);
 		$mods['ppb-product-short-description'] = array(
 			'label'       => 'WC - Short Description',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_desc',
 			'ActiveClass' => $this->class,
 		);
 		$mods['ppb-product-tabs']              = array(
 			'label'       => 'WC - Product tabs',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_tabs',
 			'ActiveClass' => $this->class,
 		);
 		$mods['ppb-product-related']           = array(
 			'label'       => 'WC - Related products',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_related',
 			'ActiveClass' => $this->class,
 		);
 		$mods['ppb-product-images']           = array(
 			'label'       => 'WC - Product images',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_images',
 			'ActiveClass' => $this->class,
 		);
 		$mods['ppb-product-rating']           = array(
 			'label'       => 'WC - Product rating',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_rating',
 			'ActiveClass' => $this->class,
 		);
 		$mods['ppb-product-reviews']           = array(
 			'label'       => 'WC - Product reviews',
 			'icon_class'  => 'dashicons dashicons-cart',
-			//'tab'         => "#pootle-$token-tab",
+			'tab'         => "#pootle-$token-tab",
 			'callback'    => 'ppbProd_reviews',
 			'ActiveClass' => $this->class,
 		);

diff --git a/inc/class-public.php b/inc/class-public.php
@@ -160,10 +160,11 @@ public function live_editor_scripts() {
 				jQuery( function ( $ ) {
 
 					ppbProdbuilderSetting = function( $t, val ) {
-						$t.find( '.ppb-edit-block .dashicons-edit' ).click();
+						$t.find( '.ppb-edit-block .settings-dialog' ).click();
 						console.log( 'ppbProdBuilder', $t, $( 'select[dialog-field="woobuilder"]' ) );
 						$('select[dialog-field="woobuilder"]').val( val );
 						$('#pootlepb-content-editor-panel + div button').click()
+						$( '#pootlepb-content-editor-panel' ).ppbDialog( 'close' );
 					};
 
 					window.ppbModules.ppbProd_a2c = function ( $t ) {

diff --git a/inc/ppb-product-tpl.php b/inc/ppb-product-tpl.php
@@ -4,4 +4,5 @@
 ?>
 <div class="product ppb-product">
 	<?php echo Pootle_Page_Builder_Render_Layout::render( get_the_ID() ); ?>
+	<?php wc()->structured_data->generate_product_data(); ?>
 </div>