We don't want trials possible if we are downgrading

Author: superdav42

inc/admin-pages/class-top-admin-nav-menu.php

@@ -191,55 +191,28 @@ public function add_top_bar_menus($wp_admin_bar): void {
 		}
 
 		/*
-		 * Add the sub-menus.
+		 * Add the settings sub-menus.
 		 */
-		$settings_tabs = Settings::get_instance()->get_sections();
+		if (current_user_can('wu_read_settings')) {
+			$settings_tabs = Settings::get_instance()->get_sections();
 
-		$addon_tabs = [];
+			$addon_tabs = [];
 
-		foreach ($settings_tabs as $tab => $tab_info) {
-			if (wu_get_isset($tab_info, 'invisible')) {
-				continue;
-			}
+			foreach ($settings_tabs as $tab => $tab_info) {
+				if (wu_get_isset($tab_info, 'invisible')) {
+					continue;
+				}
 
-			if (wu_get_isset($tab_info, 'addon', false)) {
-				$addon_tabs[ $tab ] = $tab_info;
+				if (wu_get_isset($tab_info, 'addon', false)) {
+					$addon_tabs[ $tab ] = $tab_info;
 
-				continue;
-			}
+					continue;
+				}
 
-			$wp_admin_bar->add_node(
-				[
-					'id'     => 'wp-ultimo-settings-' . $tab,
-					'parent' => 'wp-ultimo-settings',
-					'title'  => $tab_info['title'],
-					'href'   => network_admin_url('admin.php?page=wp-ultimo-settings&tab=') . $tab,
-					'meta'   => [
-						'class' => 'wp-ultimo-top-menu',
-						'title' => __('Go to the settings page', 'ultimate-multisite'),
-					],
-				]
-			);
-		}
-
-		if ($addon_tabs) {
-			$wp_admin_bar->add_node(
-				[
-					'id'     => 'wp-ultimo-settings-addons',
-					'parent' => 'wp-ultimo-settings',
-					'group'  => true,
-					'title'  => __('Addon Settings', 'ultimate-multisite'),
-					'meta'   => [
-						'class' => 'ab-sub-secondary',
-					],
-				]
-			);
-
-			foreach ($addon_tabs as $tab => $tab_info) {
 				$wp_admin_bar->add_node(
 					[
 						'id'     => 'wp-ultimo-settings-' . $tab,
-						'parent' => 'wp-ultimo-settings-addons',
+						'parent' => 'wp-ultimo-settings',
 						'title'  => $tab_info['title'],
 						'href'   => network_admin_url('admin.php?page=wp-ultimo-settings&tab=') . $tab,
 						'meta'   => [
@@ -249,6 +222,35 @@ public function add_top_bar_menus($wp_admin_bar): void {
 					]
 				);
 			}
+
+			if ($addon_tabs) {
+				$wp_admin_bar->add_node(
+					[
+						'id'     => 'wp-ultimo-settings-addons',
+						'parent' => 'wp-ultimo-settings',
+						'group'  => true,
+						'title'  => __('Addon Settings', 'ultimate-multisite'),
+						'meta'   => [
+							'class' => 'ab-sub-secondary',
+						],
+					]
+				);
+
+				foreach ($addon_tabs as $tab => $tab_info) {
+					$wp_admin_bar->add_node(
+						[
+							'id'     => 'wp-ultimo-settings-' . $tab,
+							'parent' => 'wp-ultimo-settings-addons',
+							'title'  => $tab_info['title'],
+							'href'   => network_admin_url('admin.php?page=wp-ultimo-settings&tab=') . $tab,
+							'meta'   => [
+								'class' => 'wp-ultimo-top-menu',
+								'title' => __('Go to the settings page', 'ultimate-multisite'),
+							],
+						]
+					);
+				}
+			}
 		}
 	}
 }

inc/gateways/class-stripe-checkout-gateway.php

@@ -356,7 +356,7 @@ public function run_preflight() {
 			/*
 			 * Handle trial periods.
 			 */
-			if ($this->order->has_trial()) {
+			elseif ($this->order->has_trial()) {
 				$subscription_data['subscription_data']['trial_end'] = $this->order->get_billing_start_date();
 			}
 		} else {

readme.txt

@@ -5,7 +5,7 @@ Tags: multisite, domain mapping, wordpress multisite, multisite saas, waas
 Requires at least: 5.3
 Requires PHP: 7.4.30
 Tested up to: 6.9
-Stable tag: 2.4.11
+Stable tag: 2.4.12
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -225,8 +225,8 @@ Data collected includes:
 No personal data, domains, IP addresses, or payment information are collected.
 
 == Changelog ==
-Version [2.4.11] - Released on 2026-XX-XX
-- Fix: %2F being striped breaking some WC Urls.
+Version [2.4.12] - Released on 2026-XX-XX
+- Fix: %2F being stripped breaking some WC Urls.
 - Improved: Support for changing payment methods of the membership.
 
 Version [2.4.11] - Released on 2026-02-16