feat(ia): audience checkout/payment and donations wizard (#3564)

includes/class-donations.php

@@ -75,6 +75,7 @@ public static function init() {
 			add_filter( 'newspack_blocks_donate_billing_fields_keys', [ __CLASS__, 'get_billing_fields' ] );
 			add_action( 'woocommerce_checkout_create_order_line_item', [ __CLASS__, 'checkout_create_order_line_item' ], 10, 4 );
 			add_action( 'woocommerce_coupons_enabled', [ __CLASS__, 'disable_coupons' ] );
+			add_filter( 'render_block', [ __CLASS__, 'prevent_rendering_donate_block' ], 10, 2 );
 		}
 	}
 
@@ -429,8 +430,7 @@ public static function get_donation_settings() {
 			$parsed_settings['amounts'][ $frequency ] = array_map( 'floatval', $amounts );
 		}
 
-		$parsed_settings['platform']      = self::get_platform_slug();
-		$parsed_settings['billingFields'] = self::get_billing_fields();
+		$parsed_settings['platform'] = self::get_platform_slug();
 
 		// If NYP isn't available, force untiered config.
 		if ( ! self::can_use_name_your_price() ) {
@@ -461,13 +461,6 @@ public static function set_donation_settings( $args ) {
 			if ( isset( $args['saveDonationProduct'] ) && $args['saveDonationProduct'] === true ) {
 				self::update_donation_product( $configuration );
 			}
-
-			// Update the billing fields.
-			$billing_fields = isset( $args['billingFields'] ) ? $args['billingFields'] : [];
-			if ( ! empty( $billing_fields ) ) {
-				$billing_fields = array_map( 'sanitize_text_field', $billing_fields );
-				self::update_billing_fields( $billing_fields );
-			}
 		}
 
 		Logger::log( 'Save donation settings' );
@@ -619,7 +612,6 @@ public static function get_platform_slug() {
 	 * @param string $platform Platform slug.
 	 */
 	public static function set_platform_slug( $platform ) {
-		delete_option( self::NEWSPACK_READER_REVENUE_PLATFORM );
 		update_option( self::NEWSPACK_READER_REVENUE_PLATFORM, $platform, true );
 	}
 
@@ -1094,5 +1086,22 @@ public static function disable_coupons( $enabled ) {
 		}
 		return false;
 	}
+
+	/**
+	 * Prevent rendering of Donate block if Reader Revenue platform is set to 'other.
+	 *
+	 * @param string $block_content The block content about to be rendered.
+	 * @param array  $block The data of the block about to be rendered.
+	 */
+	public static function prevent_rendering_donate_block( $block_content, $block ) {
+		if (
+			isset( $block['blockName'] )
+			&& 'newspack-blocks/donate' === $block['blockName']
+			&& self::is_platform_other()
+		) {
+			return '';
+		}
+		return $block_content;
+	}
 }
 Donations::init();

includes/class-newspack.php

@@ -148,6 +148,7 @@ private function includes() {
 		// Audience Wizard.
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-campaigns.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-donations.php';
 
 		// Network Wizard.
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-network-wizard.php';
@@ -159,7 +160,6 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-settings.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-analytics-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-engagement-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-reader-revenue-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-site-design-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-syndication-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-health-check-wizard.php';

includes/class-salesforce.php

@@ -708,7 +708,7 @@ private static function sync_salesforce( $order ) {
 	 * @return string Redirect URL.
 	 */
 	public static function get_redirect_url() {
-		return get_admin_url( null, 'admin.php?page=newspack-reader-revenue-wizard#/salesforce' );
+		return get_admin_url( null, 'admin.php?page=newspack-audience' );
 	}
 
 	/**

includes/class-wizards.php

@@ -31,7 +31,6 @@ public static function init() {
 		self::$wizards = [
 			'setup'                   => new Setup_Wizard(),
 			'site-design'             => new Site_Design_Wizard(),
-			'reader-revenue'          => new Reader_Revenue_Wizard(),
 			'syndication'             => new Syndication_Wizard(),
 			'analytics'               => new Analytics_Wizard(),
 			'components-demo'         => new Components_Demo(),
@@ -55,6 +54,7 @@ public static function init() {
 			'advertising-sponsors'    => new Advertising_Sponsors(),
 			'audience'                => new Audience_Wizard(),
 			'audience-campaigns'      => new Audience_Campaigns(),
+			'audience-donations'      => new Audience_Donations(),
 			'listings'                => new Listings_Wizard(),
 			'network'                 => new Network_Wizard(),
 			'newsletters'             => new Newsletters_Wizard(),

includes/reader-activation/class-reader-activation.php

@@ -550,8 +550,7 @@ public static function get_prerequisites_status() {
 				'description'  => __( 'Setting suggested donation amounts is required for enabling a streamlined donation experience.', 'newspack-plugin' ),
 				'instructions' => __( 'Set platform to "Newspack" or "News Revenue Hub" and configure your default donation settings. If using News Revenue Hub, set an Organization ID and a Donor Landing Page in News Revenue Hub Settings.', 'newspack-plugin' ),
 				'help_url'     => 'https://help.newspack.com/engagement/reader-activation-system',
-				// @TODO: Update when platform is added.
-				'href'         => \admin_url( '/admin.php?page=newspack-reader-revenue-wizard' ),
+				'href'         => \admin_url( '/admin.php?page=newspack-audience#/payment' ),
 				'action_text'  => __( 'Reader Revenue settings' ),
 			],
 			'ras_campaign'     => [