Merge pull request #22509 from Yoast/744-adapt-ads-for-new-pricing-and-packaging---upgrade-button-in-wp-sidebar-and-wp-admin-menu

Add upgrade buttons

Author: vraja-pro

admin/class-admin-asset-manager.php

@@ -625,6 +625,7 @@ protected function styles_to_be_registered() {
 			[
 				'name' => 'admin-global',
 				'src'  => 'admin-global-' . $flat_version,
+				'deps' => [ self::PREFIX . 'tailwind' ],
 			],
 			[
 				'name' => 'filter-explanation',

css/src/adminbar.css

@@ -5,6 +5,7 @@
  * @package WPSEO
  */
 
+use Yoast\WP\SEO\Conditionals\WooCommerce_Conditional;
 use Yoast\WP\SEO\Helpers\Product_Helper;
 use Yoast\WP\SEO\Helpers\Score_Icon_Helper;
 use Yoast\WP\SEO\Integrations\Support_Integration;
@@ -590,6 +591,12 @@ protected function add_get_help_submenu( WP_Admin_Bar $wp_admin_bar ) {
 	 * @return void
 	 */
 	protected function add_premium_link( WP_Admin_Bar $wp_admin_bar ) {
+		$has_woocommerce = ( new Woocommerce_Conditional() )->is_met();
+		$link            = $this->shortlinker->build_shortlink( 'https://yoa.st/admin-bar-get-premium' );
+		if ( $has_woocommerce ) {
+			$link = $this->shortlinker->build_shortlink( 'https://yoa.st/admin-bar-get-premium-woocommerce' );
+		}
+
 		$sale_percentage = '';
 		if ( YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2024-promotion' ) ) {
 			$sale_percentage = sprintf(
@@ -603,9 +610,9 @@ protected function add_premium_link( WP_Admin_Bar $wp_admin_bar ) {
 				'id'     => 'wpseo-get-premium',
 				// Circumvent an issue in the WP admin bar API in order to pass `data` attributes. See https://core.trac.wordpress.org/ticket/38636.
 				'title'  => sprintf(
-					'<a href="%1$s" target="_blank" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2" style="padding:0;">%2$s &raquo; %3$s</a>',
-					esc_url( $this->shortlinker->build_shortlink( 'https://yoa.st/admin-bar-get-premium' ) ),
-					esc_html__( 'Get Yoast SEO Premium', 'wordpress-seo' ),
+					'<a href="%1$s" target="_blank" data-action="load-nfd-ctb" data-ctb-id="f6a84663-465f-4cb5-8ba5-f7a6d72224b2">%2$s %3$s</a>',
+					esc_url( $link ),
+					esc_html__( 'Upgrade', 'wordpress-seo' ),
 					$sale_percentage
 				),
 				'meta'   => [

inc/class-wpseo-admin-bar-menu.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace Yoast\WP\SEO\Plans\User_Interface;
+
+use WPSEO_Shortlinker;
+use Yoast\WP\SEO\Conditionals\Traits\Admin_Conditional_Trait;
+use Yoast\WP\SEO\Conditionals\WooCommerce_Conditional;
+use Yoast\WP\SEO\General\User_Interface\General_Page_Integration;
+use Yoast\WP\SEO\Helpers\Current_Page_Helper;
+use Yoast\WP\SEO\Helpers\Product_Helper;
+use Yoast\WP\SEO\Integrations\Integration_Interface;
+
+/**
+ * Adds the plans page to the Yoast admin menu.
+ */
+class Upgrade_Sidebar_Menu_Integration implements Integration_Interface {
+
+	use Admin_Conditional_Trait;
+
+	/**
+	 * The page name.
+	 */
+	public const PAGE = 'wpseo_upgrade_sidebar';
+
+	/**
+	 * The WooCommerce conditional.
+	 *
+	 * @var WooCommerce_Conditional
+	 */
+	private $woocommerce_conditional;
+
+	/**
+	 * The shortlinker.
+	 *
+	 * @var WPSEO_Shortlinker
+	 */
+	private $shortlinker;
+
+	/**
+	 * The product helper.
+	 *
+	 * @var Product_Helper
+	 */
+	private $product_helper;
+
+	/**
+	 * The current page helper.
+	 *
+	 * @var Current_Page_Helper
+	 */
+	private $current_page_helper;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param WooCommerce_Conditional $woocommerce_conditional The WooCommerce conditional.
+	 * @param WPSEO_Shortlinker       $shortlinker             The shortlinker.
+	 * @param Product_Helper          $product_helper          The product helper.
+	 * @param Current_Page_Helper     $current_page_helper     The current page helper.
+	 */
+	public function __construct(
+		WooCommerce_Conditional $woocommerce_conditional,
+		WPSEO_Shortlinker $shortlinker,
+		Product_Helper $product_helper,
+		Current_Page_Helper $current_page_helper
+	) {
+		$this->woocommerce_conditional = $woocommerce_conditional;
+		$this->shortlinker             = $shortlinker;
+		$this->product_helper          = $product_helper;
+		$this->current_page_helper     = $current_page_helper;
+	}
+
+	/**
+	 * Initializes the integration.
+	 *
+	 * This is the place to register hooks and filters.
+	 *
+	 * @return void
+	 */
+	public function register_hooks() {
+		// Add page with PHP_INT_MAX so its always the last item.
+		\add_filter( 'wpseo_submenu_pages', [ $this, 'add_page' ], \PHP_INT_MAX );
+		\add_filter( 'wpseo_network_submenu_pages', [ $this, 'add_page' ], \PHP_INT_MAX );
+		\add_action( 'admin_init', [ $this, 'do_redirect' ], 1 );
+	}
+
+	/**
+	 * Adds the page to the (currently) last position in the array.
+	 *
+	 * @param array<string, array<string, array<static|string>>> $pages The pages.
+	 *
+	 * @return array<string, array<string, array<static|string>>> The pages.
+	 */
+	public function add_page( $pages ) {
+
+		if ( ! $this->product_helper->is_premium() ) {
+			$pages[] = [
+				General_Page_Integration::PAGE,
+				'',
+				'<span class="yst-root"><span class="yst-button yst-w-full yst-button--upsell yst-button--small">' . \__( 'Upgrade', 'wordpress-seo' ) . ' </span></span>',
+				'wpseo_manage_options',
+				self::PAGE,
+				static function () {
+					echo 'redirecting...';
+				},
+			];
+		}
+
+		return $pages;
+	}
+
+	/**
+	 * Redirects to the yoast.com.
+	 *
+	 * @return void
+	 */
+	public function do_redirect(): void {
+
+		if ( $this->current_page_helper->get_current_yoast_seo_page() !== self::PAGE ) {
+			return;
+		}
+		$link = $this->shortlinker->build_shortlink( 'https://yoa.st/wordpress-menu-upgrade-premium' );
+		if ( $this->woocommerce_conditional->is_met() ) {
+			$link = $this->shortlinker->build_shortlink( 'https://yoa.st/wordpress-menu-upgrade-woocommerce' );
+		}
+
+		\wp_redirect( $link );//phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect -- Safe redirect is used here.
+		exit;
+	}
+}