feat: add popup info to donation block

Automattic · Feb 24, 2023 · 9493990 · 9493990
2 parents 7b9483a + 777685a
commit 9493990
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/blocks/donate/class-wp-rest-newspack-donate-controller.php b/src/blocks/donate/class-wp-rest-newspack-donate-controller.php
@@ -124,16 +124,26 @@ public function api_process_donation( $request ) {
 			}
 		}
 
+		$referer = $request->get_param( '_wp_http_referer' );
+		if ( ! $referer ) {
+			$referer = \wp_get_referer();
+		}
+
 		$payment_metadata = [
-			'referer' => \wp_get_referer(),
+			'referer' => $referer,
 		];
+
 		if ( class_exists( 'Newspack\NRH' ) && method_exists( 'Newspack\NRH', 'get_nrh_config' ) ) {
 			$nrh_config = \Newspack\NRH::get_nrh_config();
 			if ( isset( $nrh_config['nrh_salesforce_campaign_id'] ) ) {
 				$payment_metadata['sf_campaign_id'] = $nrh_config['nrh_salesforce_campaign_id'];
 			}
 		}
 
+		if ( ! empty( $request->get_param( 'newspack_popup_id' ) ) ) {
+			$payment_metadata['newspack_popup_id'] = $request->get_param( 'newspack_popup_id' );
+		}
+
 		$frequency = $request->get_param( 'frequency' );
 		$full_name = $request->get_param( 'full_name' );
 		$origin    = $request->get_param( 'origin' );

diff --git a/src/blocks/donate/frontend/class-newspack-blocks-donate-renderer-base.php b/src/blocks/donate/frontend/class-newspack-blocks-donate-renderer-base.php
@@ -300,6 +300,11 @@ protected static function render_streamlined_payment_ui( $attributes ) {
 	 */
 	protected static function render_donate_form_input() {
 		ob_start();
+		/**
+		 * Action to add custom fields before the form fields of the donation block.
+		 */
+		do_action( 'newspack_blocks_donate_before_form_fields' );
+		wp_referer_field();
 		?>
 			<input type='hidden' name='newspack_donate' value='1' />
 		<?php

diff --git a/src/blocks/donate/streamlined/index.ts b/src/blocks/donate/streamlined/index.ts
@@ -136,6 +136,8 @@ export const processStreamlinedElements = ( parentElement = document ) =>
 				full_name: formValues.full_name,
 				frequency: formValues.donation_frequency,
 				newsletter_opt_in: Boolean( formValues.newsletter_opt_in ),
+				newspack_popup_id: formValues.newspack_popup_id,
+				_wp_http_referer: formValues._wp_http_referer,
 				clientId: formValues.cid,
 				origin,
 				additional_fields: additionalFields,

diff --git a/src/blocks/donate/types.ts b/src/blocks/donate/types.ts
@@ -20,6 +20,8 @@ export type DonationFormValues = {
 	cid?: string;
 	agree_to_pay_fees?: string;
 	newsletter_opt_in?: string;
+	newspack_popup_id?: string;
+	_wp_http_referer?: string;
 };
 
 export type DonationSettings = {