Merge branch 'develop' into feature/campaign-shortcodes-GIVE-2391-2392

Author: JoshuaHungDinh

give.php

@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 4.0.0
+ * Version: 4.1.0
  * Requires at least: 6.5
  * Requires PHP: 7.4
  * Text Domain: give
@@ -420,7 +420,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '4.0.0');
+            define('GIVE_VERSION', '4.1.0');
         }
 
         // Plugin Root File.

includes/actions.php

@@ -213,7 +213,7 @@ function _give_save_donor_billing_address( $payment_id ) {
 /**
  * Verify addon dependency before addon update
  *
- * @unreleased add bailout for GiveWP to protect it from licensing issues
+ * @since 4.1.0 add bailout for GiveWP to protect it from licensing issues
  * @since 2.1.4
  *
  * @param $error

includes/admin/class-admin-settings.php

@@ -316,16 +316,17 @@ public static function get_option( $option_name = '', $field_id = '', $default =
 		 * Output admin fields.
 		 *
 		 * Loops though the give options array and outputs each field.
-		 *
-		 * @todo Refactor this function
-		 *
+         *
+         * @since 4.1.0 Display tabs only when there is more than one group available
 		 * @since  1.8
 		 * @access public
-		 *
-		 * @param array  $sections     Opens array to output.
-		 * @param string $option_name Opens array to output.
+         *
+         * @param array  $sections    Opens array to output.
+         * @param string $option_name Opens array to output.
 		 *
 		 * @return void
+         * @todo       Refactor this function
+         *
 		 */
 		public static function output_fields( $sections, $option_name = '' ) {
 
@@ -338,25 +339,29 @@ public static function output_fields( $sections, $option_name = '' ) {
 				$defaultGroup = current( array_keys( $groups ) );
 				?>
 				<div class="give-settings-section-content">
-					<div class="give-settings-section-group-menu">
-						<ul>
-							<?php
-							foreach ( $groups as $slug => $group ) {
-								$current_group = ! empty( $_GET['group'] ) ? give_clean( $_GET['group'] ) : $defaultGroup;
-								$active_class  = ( $slug === $current_group ) ? 'active' : '';
-
-								echo sprintf(
-									'<li><a class="%1$s" href="%2$s" data-group="%3$s">%4$s</a></li>',
-									esc_html( $active_class ),
-									esc_url( admin_url( "edit.php?post_type=give_forms&page={$current_page}&tab={$current_tab}&section={$current_section}&group={$slug}" ) ),
-									esc_html( $slug ),
-									esc_html( $group )
-								);
-							}
-							?>
-						</ul>
-					</div>
-					<div class="give-settings-section-group-content">
+                    <?php
+                    if (count($groups) > 1) : ?>
+                        <div class="give-settings-section-group-menu">
+                            <ul>
+                                <?php
+                                foreach ($groups as $slug => $group) {
+                                    $current_group = ! empty($_GET['group']) ? give_clean($_GET['group']) : $defaultGroup;
+                                    $active_class = ($slug === $current_group) ? 'active' : '';
+
+                                    echo sprintf(
+                                        '<li><a class="%1$s" href="%2$s" data-group="%3$s">%4$s</a></li>',
+                                        esc_html($active_class),
+                                        esc_url(admin_url("edit.php?post_type=give_forms&page={$current_page}&tab={$current_tab}&section={$current_section}&group={$slug}")),
+                                        esc_html($slug),
+                                        esc_html($group)
+                                    );
+                                }
+                                ?>
+                            </ul>
+                        </div>
+                    <?php
+                    endif; ?>
+                    <div class="give-settings-section-group-content">
 						<?php
 						foreach ( $sections as $group => $fields ) {
 							$current_group = ! empty( $_GET['group'] ) ? give_clean( $_GET['group'] ) : $defaultGroup;
@@ -446,7 +451,7 @@ public static function output_fields( $sections, $option_name = '' ) {
 		/**
 		 * This function will help you prepare the admin settings field.
 		 *
-         * @unreleased Added support for code editor field.
+         * @since 4.1.0 Added support for code editor field.
 		 * @since  2.5.5
 		 *
 		 * @param array  $value       Settings Field Array.
@@ -1138,7 +1143,7 @@ public static function get_field_title( $value ) {
 		 *
 		 * Loops though the give options array and outputs each field.
 		 *
-         * @unreleased Added validation for code editor field.
+         * @since 4.1.0 Added validation for code editor field.
 		 * @since  1.8
 		 *
 		 * @param  array  $options     Options array to output

includes/admin/class-give-html-elements.php

@@ -229,7 +229,7 @@ public function forms_dropdown( $args = array() ) {
 	}
 
     /**
-     * @unreleased
+     * @since 4.1.0
      */
     public function campaigns_dropdown($args = [])
     {
@@ -262,7 +262,7 @@ public function campaigns_dropdown($args = [])
         /**
          * Filter the campaigns dropdown.
          *
-         * @unreleased
+         * @since 4.1.0
          *
          * @param array $campaigns_args Arguments for campaigns_dropdown query.
          *

includes/admin/settings/class-settings-advanced.php

@@ -58,7 +58,7 @@ public function __construct()
         /**
          * Get settings array.
          *
-         * @unreleased Added Donation Forms section
+         * @since 4.1.0 Added Donation Forms section
          * @since  1.8
          * @return array
          */