Merge pull request #153 from godaddy/feat/open-new-tab

feat: add 'open in new tab' option
godaddy · Aug 3, 2023 · 7fe935f · 7fe935f
2 parents 6651f3f + 22b1992
commit 7fe935f
Show file tree

Hide file tree

Showing 22 changed files with 143 additions and 15 deletions.
diff --git a/.dev/src/blocks/domain-search/attributes.js b/.dev/src/blocks/domain-search/attributes.js
@@ -20,6 +20,10 @@ const attributes = {
  type: 'boolean',
  default: false,
  },
+ new_tab: {
+ type: 'boolean',
+ default: false,
+ },
  page_size: {
  type: 'number',
  default: 5,

diff --git a/.dev/src/blocks/domain-search/inspector.js b/.dev/src/blocks/domain-search/inspector.js
@@ -60,6 +60,15 @@ const Inspector = ( { attributes, setAttributes } ) => {
  label={ __( 'Display results in a modal', 'reseller-store' ) }
  checked={ attributes.modal }
  onChange={ ( modal ) => setAttributes( { modal } ) }
+ /> 
+ </Fragment>
+ ) }
+ { 'advanced' !== attributes.search_type && (
+ <Fragment>
+ <CheckboxControl
+ label={ __( 'Display results in a new tab', 'reseller-store' ) }
+ checked={ attributes.new_tab }
+ onChange={ ( new_tab ) => setAttributes( { new_tab } ) }
  />
  </Fragment>
  ) }

diff --git a/.dev/src/blocks/product/attributes.js b/.dev/src/blocks/product/attributes.js
@@ -24,6 +24,10 @@ const attributes = {
  type: 'string',
  default: __( 'Add to cart', 'reseller-store' ),
  },
+ button_new_tab: {
+ type: 'boolean',
+ default: false,
+ },
  content_height: {
  type: 'number',
  default: 250,

diff --git a/.dev/src/blocks/product/components/inspector.js b/.dev/src/blocks/product/components/inspector.js
@@ -65,6 +65,13 @@ const Inspector = ( { posts, media, attributes, setAttributes } ) => {
  value={ attributes.button_label }
  onChange={ ( buttonLabel ) => setAttributes( { button_label: buttonLabel } ) }
  />
+ <CheckboxControl
+ label={ __( 'Display results in a new tab', 'reseller-store' ) }
+ checked={ attributes.button_new_tab }
+ onChange={ ( checked ) => {
+ setAttributes( { button_new_tab: checked } );
+ } }
+ />
  </PanelBody>
  <PanelBody>
  <CheckboxControl

diff --git a/assets/js/editor.blocks.min.js b/assets/js/editor.blocks.min.js
diff --git a/class-plugin.php b/class-plugin.php
@@ -33,7 +33,7 @@ final class Plugin {
  *
  * @var string
  */
- const VERSION = '2.2.13';
+ const VERSION = '2.2.14';
 
  /**
  * Plugin prefix.

diff --git a/includes/functions/template-functions.php b/includes/functions/template-functions.php
@@ -95,7 +95,7 @@ function rstore_price( $post = null, $echo = false ) {
  *
  * @return string|null
  */
-function rstore_add_to_cart_form( $post, $echo = false, $button_label = null, $text_cart = null, $redirect = true ) {
+function rstore_add_to_cart_form( $post, $echo = false, $button_label = null, $button_new_tab = null, $text_cart = null, $redirect = true ) {
 
  $post = get_post( $post );
 
@@ -132,10 +132,12 @@ function rstore_add_to_cart_form( $post, $echo = false, $button_label = null, $t
  $items = json_encode( array( $data ) );
 
  $cart_form = sprintf(
- '<form class="rstore-add-to-cart-form" method="POST" action="%s" ><input type="hidden" name="items" value=\'%s\' /><button class="rstore-add-to-cart button btn btn-primary" type="submit">%s</button><div class="rstore-loading rstore-loading-hidden"></div></form>',
+ '<form class="rstore-add-to-cart-form" method="POST" action="%s"%s><input type="hidden" name="items" value=\'%s\' /><button class="rstore-add-to-cart button btn btn-primary" type="submit">%s</button>%s</form>',
  $cart_url,
+ $button_new_tab ? ' target="_blank"' : '',
  $items,
- esc_html( $button_label )
+ esc_html( $button_label ),
+ $button_new_tab ? '' : '<div class="rstore-loading rstore-loading-hidden"></div>'
  );
 
  } else {
@@ -209,7 +211,7 @@ function rstore_append_add_to_cart_form( $content ) {
  $content .= rstore_price( $post->ID );
 
  $redirect = ! ( (bool) rstore_get_product_meta( $post->ID, 'skip_cart_redirect' ) );
- $content .= rstore_add_to_cart_form( $post->ID, false, null, null, $redirect );
+ $content .= rstore_add_to_cart_form( $post->ID, false, null, null, null, $redirect );
 
  }
 

diff --git a/includes/modules/rstore-fl-domain-simple.php b/includes/modules/rstore-fl-domain-simple.php
@@ -64,6 +64,15 @@ public function __construct() {
  'label' => __( 'Button', 'reseller-store' ),
  'default' => __( 'Search', 'reseller-store' ),
  ),
+ 'new_tab' => array(
+ 'type' => 'select',
+ 'label' => __( 'Display results in a new tab', 'reseller-store' ),
+ 'default' => '0',
+ 'options' => array(
+ '1' => __( 'Yes', 'reseller-store' ),
+ '0' => __( 'No', 'reseller-store' ),
+ ),
+ ),
  ),
  ),
  ),

diff --git a/includes/modules/rstore-fl-domain-transfer.php b/includes/modules/rstore-fl-domain-transfer.php
@@ -64,6 +64,15 @@ public function __construct() {
  'label' => __( 'Button', 'reseller-store' ),
  'default' => __( 'Transfer', 'reseller-store' ),
  ),
+ 'new_tab' => array(
+ 'type' => 'select',
+ 'label' => __( 'Display results in a new tab', 'reseller-store' ),
+ 'default' => '0',
+ 'options' => array(
+ '1' => __( 'Yes', 'reseller-store' ),
+ '0' => __( 'No', 'reseller-store' ),
+ ),
+ ),
  ),
  ),
  ),

diff --git a/includes/modules/rstore-fl-product.php b/includes/modules/rstore-fl-product.php
@@ -84,6 +84,15 @@ public function __construct() {
  'description' => __( 'Leave blank to hide button', 'reseller-store' ),
  'default' => __( 'Add to cart', 'reseller-store' ),
  ),
+ 'button_new_tab' => array(
+ 'type' => 'select',
+ 'label' => __( 'Open Results In A New Tab', 'reseller-store' ),
+ 'default' => '0',
+ 'options' => array(
+ '1' => __( 'Yes', 'reseller-store' ),
+ '0' => __( 'No', 'reseller-store' ),
+ ),
+ ),
  'show_title' => array(
  'type' => 'select',
  'label' => __( 'Title', 'reseller-store' ),

diff --git a/includes/modules/rstore-vc-domain-simple.php b/includes/modules/rstore-vc-domain-simple.php
@@ -80,6 +80,18 @@ public function vc_mapping() {
  'weight' => 0,
  ),
 
+ array(
+ 'type' => 'checkbox',
+ 'holder' => 'div',
+ 'class' => 'text-class',
+ 'heading' => __( 'Display results in a new tab', 'reseller-store' ),
+ 'param_name' => 'new_tab',
+ 'value' => array(
+ __( 'Show', 'reseller-store' ) => 1,
+ ),
+ 'group' => 'Results',
+ ),
+
  ),
  )
  );

diff --git a/includes/modules/rstore-vc-domain-transfer.php b/includes/modules/rstore-vc-domain-transfer.php
@@ -83,6 +83,18 @@ public function vc_mapping() {
  'group' => 'Custom Group',
  ),
 
+ array(
+ 'type' => 'checkbox',
+ 'holder' => 'div',
+ 'class' => 'text-class',
+ 'heading' => __( 'Display results in a new tab', 'reseller-store' ),
+ 'param_name' => 'new_tab',
+ 'value' => array(
+ __( 'Show', 'reseller-store' ) => 1,
+ ),
+ 'group' => 'Results',
+ ),
+
  ),
  )
  );

diff --git a/includes/modules/rstore-vc-product.php b/includes/modules/rstore-vc-product.php
@@ -86,6 +86,18 @@ public function vc_mapping() {
  'group' => __( 'Display', 'reseller-store' ),
  ),
 
+ array(
+ 'type' => 'checkbox',
+ 'holder' => 'div',
+ 'class' => 'text-class',
+ 'heading' => __( 'Open Results In A New Tab', 'reseller-store' ),
+ 'param_name' => 'new_tab',
+ 'value' => array(
+ __( 'No', 'reseller-store' ) => 0,
+ ),
+ 'group' => __( 'Display', 'reseller-store' ),
+ ),
+
  array(
  'type' => 'checkbox',
  'holder' => 'div',

diff --git a/includes/widgets/class-domain-simple.php b/includes/widgets/class-domain-simple.php
@@ -96,8 +96,13 @@ public function widget( $args, $instance ) {
 
  }
 
+ $target = '';
+ if ( ! empty($data['new_tab'])) {
+ $target = ' target="_blank"';
+ }
+
  ?>
- <form role="search" method="get" class="search-form" action="<?php echo esc_url_raw( rstore()->api->url( 'www', 'products/domain-registration/find' ), 'https' ); ?>">
+ <form role="search" method="get" class="search-form" action="<?php echo esc_url_raw( rstore()->api->url( 'www', 'products/domain-registration/find' ), 'https' ); ?>"<?php echo $target; ?>>
  <label>
  <input type="search" class="search-field" placeholder="<?php echo esc_attr( $data['text_placeholder'] ); ?>" name="domainToCheck" required>
  </label>
@@ -172,6 +177,7 @@ private function get_data( $instance ) {
  'title' => isset( $instance['title'] ) ? $instance['title'] : apply_filters( 'rstore_domain_title', '' ),
  'text_placeholder' => isset( $instance['text_placeholder'] ) ? $instance['text_placeholder'] : apply_filters( 'rstore_domain_text_placeholder', esc_html__( 'Find your perfect domain name', 'reseller-store' ) ),
  'text_search' => isset( $instance['text_search'] ) ? $instance['text_search'] : apply_filters( 'rstore_domain_text_search', esc_html__( 'Search', 'reseller-store' ) ),
+ 'new_tab' => isset( $instance['new_tab'] ) ? $instance['new_tab'] : false,
  );
  }
 

diff --git a/includes/widgets/class-domain-transfer.php b/includes/widgets/class-domain-transfer.php
@@ -96,8 +96,13 @@ public function widget( $args, $instance ) {
 
  }
 
+ $target = '';
+ if ( ! empty($data['new_tab'])) {
+ $target = ' target="_blank"';
+ }
+
  ?>
- <form role="search" method="get" class="search-form" action="<?php echo esc_url_raw( rstore()->api->url( 'www', 'products/domain-transfer' ), 'https' ); ?>">
+ <form role="search" method="get" class="search-form" action="<?php echo esc_url_raw( rstore()->api->url( 'www', 'products/domain-transfer' ), 'https' ); ?>"<?php echo $target ?>>
  <label>
  <input type="search" class="search-field" placeholder="<?php echo esc_attr( $data['text_placeholder'] ); ?>" name="domainToCheck" required>
  </label>
@@ -153,6 +158,7 @@ public function update( $new_instance, $old_instance ) {
  $instance['title'] = isset( $new_instance['title'] ) ? sanitize_text_field( $new_instance['title'] ) : null;
  $instance['text_placeholder'] = isset( $new_instance['text_placeholder'] ) ? wp_kses_post( $new_instance['text_placeholder'] ) : null;
  $instance['text_search'] = isset( $new_instance['text_search'] ) ? wp_kses_post( $new_instance['text_search'] ) : null;
+ $instance['new_tab'] = isset( $new_instance['new_tab'] ) ? (bool) $new_instance['new_tab'] : false;
 
  return $instance;
 
@@ -172,6 +178,7 @@ private function get_data( $instance ) {
  'title' => isset( $instance['title'] ) ? $instance['title'] : apply_filters( 'rstore_domain_transfer_title', '' ),
  'text_placeholder' => isset( $instance['text_placeholder'] ) ? $instance['text_placeholder'] : apply_filters( 'rstore_domain_transfer_text_placeholder', esc_html__( 'Enter domain to transfer', 'reseller-store' ) ),
  'text_search' => isset( $instance['text_search'] ) ? $instance['text_search'] : apply_filters( 'rstore_domain_transfer_text_search', esc_html__( 'Transfer', 'reseller-store' ) ),
+ 'new_tab' => isset( $instance['new_tab'] ) ? $instance['new_tab'] : false,
  );
  }
 

diff --git a/includes/widgets/class-product.php b/includes/widgets/class-product.php
@@ -129,7 +129,7 @@ public function widget( $args, $instance ) {
 
  if ( ! empty( $data['button_label'] ) ) {
 
- $content .= rstore_add_to_cart_form( $post_id, false, $data['button_label'], $data['text_cart'], $data['redirect'] ); // xss ok.
+ $content .= rstore_add_to_cart_form( $post_id, false, $data['button_label'], $data['button_new_tab'], $data['text_cart'], $data['redirect'] ); // xss ok.
 
  }
  }
@@ -179,7 +179,7 @@ public function widget( $args, $instance ) {
 
  if ( ! empty( $data['button_label'] ) ) {
 
- $content .= rstore_add_to_cart_form( $post_id, false, $data['button_label'], $data['text_cart'], $data['redirect'] );
+ $content .= rstore_add_to_cart_form( $post_id, false, $data['button_label'], $data['button_new_tab'], $data['text_cart'], $data['redirect'] );
 
  }
  }
@@ -273,6 +273,7 @@ public function update( $new_instance, $old_instance ) {
  $instance['redirect'] = isset( $new_instance['redirect'] ) ? (bool) absint( $new_instance['redirect'] ) : false;
  $instance['image_size'] = isset( $new_instance['image_size'] ) ? sanitize_text_field( $new_instance['image_size'] ) : null;
  $instance['button_label'] = isset( $new_instance['button_label'] ) ? sanitize_text_field( $new_instance['button_label'] ) : '';
+ $instance['button_new_tab'] = isset( $new_instance['button_new_tab'] ) ? sanitize_text_field( $new_instance['button_new_tab'] ) : '';
  $instance['text_cart'] = isset( $new_instance['text_cart'] ) ? sanitize_text_field( $new_instance['text_cart'] ) : '';
  $instance['text_more'] = isset( $new_instance['text_more'] ) ? sanitize_text_field( $new_instance['text_more'] ) : '';
  $instance['content_height'] = isset( $new_instance['content_height'] ) ? absint( $new_instance['content_height'] ) : null;
@@ -346,6 +347,7 @@ private function get_data( $instance ) {
  'show_price' => isset( $instance['show_price'] ) ? ! empty( $instance['show_price'] ) : apply_filters( 'rstore_product_show_price', true ),
  'redirect' => isset( $instance['redirect'] ) ? ! empty( $instance['redirect'] ) : apply_filters( 'rstore_product_redirect', true ),
  'button_label' => isset( $instance['button_label'] ) ? $instance['button_label'] : apply_filters( 'rstore_product_button_label', esc_html__( 'Add to cart', 'reseller-store' ) ),
+ 'button_new_tab' => isset( $instance['button_new_tab'] ) ? $instance['button_new_tab'] : false,
  'text_cart' => isset( $instance['text_cart'] ) ? $instance['text_cart'] : apply_filters( 'rstore_product_text_cart', esc_html__( 'Continue to cart', 'reseller-store' ) ),
  'text_more' => isset( $instance['text_more'] ) ? $instance['text_more'] : apply_filters( 'rstore_product_text_more', esc_html__( 'More info', 'reseller-store' ) ),
  'content_height' => isset( $instance['content_height'] ) ? intval( $instance['content_height'] ) : apply_filters( 'rstore_product_content_height', 250 ),

diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@
 **Requires at least:** 4.6 
 **Tested up to:** 6.2.2 
 **Requires PHP:** 5.4 
-**Stable tag:** 2.2.13
+**Stable tag:** 2.2.14 
 **License:** GPL-2.0 
 **License URI:** https://www.gnu.org/licenses/gpl-2.0.html 
 
@@ -102,6 +102,11 @@ While we recommend you use our widgets for your storefront, we do have a shortco
 You can add `?domainToCheck=example.com` to your query string on any page that has the domain search widget and the widget will perform an automatic search on page load.
 
 ## Changelog ##
+
+### 2.2.14 - August 2023 ###
+
+* Update: Add option to open cart and search results in new tab
+
 ### 2.2.13 - July 2023 ###
 
 * Update: Fix for compatibility with Beaver Builder and Classic Editor Plugins

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: reseller, program, storefront, products, posts, shortcode, ec
 Requires at least: 4.6
 Tested up to: 6.2.2
 Requires PHP: 5.4
-Stable tag: 2.2.13
+Stable tag: 2.2.14
 License: GPL-2.0
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -98,6 +98,11 @@ While we recommend you use our widgets for your storefront, we do have a shortco
 You can add `?domainToCheck=example.com` to your query string on any page that has the domain search widget and the widget will perform an automatic search on page load.
 
 == Changelog ==
+
+= 2.2.14 - August 2023 =
+
+* Update: Add option to open cart and search results in new tab
+
 = 2.2.13 - July 2023 =
 
 * Update: Fix for compatibility with Beaver Builder and Classic Editor Plugins

diff --git a/reseller-store.php b/reseller-store.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Reseller Store
  * Description: Sell hosting, domains, and more right from your WordPress site.
- * Version: 2.2.13
+ * Version: 2.2.14
  * Author: GoDaddy
  * Author URI: https://reseller.godaddy.com/
  * License: GPL-2.0

diff --git a/tests/test-template-functions.php b/tests/test-template-functions.php
@@ -18,7 +18,19 @@ public function test_rstore_add_to_cart_form_echo_redirect() {
 
  rstore_add_to_cart_form( $post, true );
 
- $this->expectOutputRegex( '/<form class="rstore-add-to-cart-form" method="POST" action="https:\/\/www.secureserver.net\/api\/v1\/cart\/1592\/\?redirect=1&plid=1592" ><input type="hidden" name="items" value=\'\[{"id":"wordpress-basic","quantity":1}\]\' \/><button class="rstore-add-to-cart button btn btn-primary" type="submit">Add to cart<\/button><div class="rstore-loading rstore-loading-hidden"><\/div><\/form>/' );
+ $this->expectOutputRegex( '/<form class="rstore-add-to-cart-form" method="POST" action="https:\/\/www.secureserver.net\/api\/v1\/cart\/1592\/\?redirect=1&plid=1592"><input type="hidden" name="items" value=\'\[{"id":"wordpress-basic","quantity":1}\]\' \/><button class="rstore-add-to-cart button btn btn-primary" type="submit">Add to cart<\/button><div class="rstore-loading rstore-loading-hidden"><\/div><\/form>/' );
+
+ }
+
+ public function test_rstore_add_to_cart_form_open_new_tab() {
+
+ rstore_update_option( 'pl_id', 1592 );
+
+ $post = Tests\Helper::create_product();
+
+ rstore_add_to_cart_form( $post, true, null, true);
+
+ $this->expectOutputRegex( '/<form class="rstore-add-to-cart-form" method="POST" action="https:\/\/www.secureserver.net\/api\/v1\/cart\/1592\/\?redirect=1&plid=1592" target="_blank"><input type="hidden" name="items" value=\'\[{"id":"wordpress-basic","quantity":1}\]\' \/><button class="rstore-add-to-cart button btn btn-primary" type="submit">Add to cart<\/button><\/form>/' );
 
  }
 
@@ -29,7 +41,7 @@ public function test_rstore_add_to_cart_form_echo_no_redirect() {
 
  $post = Tests\Helper::create_product();
 
- rstore_add_to_cart_form( $post, true, null, null, false );
+ rstore_add_to_cart_form( $post, true, null, null, null, false );
 
  $this->expectOutputRegex( '/<div class="rstore-add-to-cart-form"><div><button class="rstore-add-to-cart button btn btn-primary" data-id="wordpress-basic" data-quantity="1">Add to cart<\/button><\/div><div class="rstore-loading rstore-loading-hidden"><\/div><div class="rstore-cart rstore-cart-hidden"><span class="dashicons dashicons-yes rstore-success"><\/span><a href="https:\/\/cart.secureserver.net\/go\/checkout\/" rel="nofollow">Continue to cart<\/a><\/div><div class="rstore-message rstore-message-hidden"><\/div><\/div>/' );
 

diff --git a/tests/test-widget-domain-transfer.php b/tests/test-widget-domain-transfer.php
@@ -67,6 +67,7 @@ function test_widget_update() {
  'title' => 'title 1',
  'text_placeholder' => 'placeholder',
  'text_search' => 'text_search',
+ 'new_tab' => false,
  );
 
  $instance = $widget->update( $new_instance, $old_instance );

diff --git a/tests/test-widget-product.php b/tests/test-widget-product.php
@@ -205,6 +205,7 @@ function test_widget_update() {
  'text_more' => 'text_more 1',
  'content_height' => 150,
  'layout_type' => 'default',
+ 'button_new_tab' => false,
  );
 
  $instance = $widget->update( $new_instance, $old_instance );