Google Tag Manager: Send through Tier1/2/3/OneTime products for trigger identification

support-frontend/assets/helpers/tracking/googleTagManager.ts

@@ -1,6 +1,7 @@
 import { v4 as uuidv4 } from 'uuid';
 import type { ContributionType } from 'helpers/contributions';
 import type { IsoCurrency } from 'helpers/internationalisation/currency';
+import type { ProductKey } from 'helpers/productCatalog';
 import type { BillingPeriod } from 'helpers/productPrice/billingPeriods';
 import type { SubscriptionProduct } from 'helpers/productPrice/subscriptions';
 import * as storage from 'helpers/storage/storage';
@@ -19,7 +20,7 @@ type ContributionConversionData = {
 	contributionType: ContributionType;
 	currency: IsoCurrency;
 	paymentMethod: PaymentMethod;
-	productType: 'Contribution';
+	productType: ProductKey;
 };
 
 type SubscriptionConversionData = {
@@ -254,13 +255,14 @@ function successfulContributionConversion(
 	contributionType: ContributionType,
 	sourceCurrency: IsoCurrency,
 	paymentMethod: PaymentMethod,
+	productKey: ProductKey,
 ): void {
 	const contributionConversionData: ContributionConversionData = {
 		value: amount,
 		contributionType,
 		currency: sourceCurrency,
 		paymentMethod,
-		productType: 'Contribution',
+		productType: productKey,
 	};
 
 	sendData('SuccessfulConversion', contributionConversionData);

support-frontend/assets/pages/[countryGroupId]/components/thankyou.tsx

@@ -150,14 +150,15 @@ export function ThankYouComponent({
 				: order.paymentMethod;
 
 		successfulContributionConversion(
-			payment.originalAmount,
+			payment.finalAmount, // This is the final amount after discounts
 			contributionType,
 			currencyKey,
 			paymentMethod,
+			productKey ?? 'Contribution', // One-off is labelled Contribution in Tag Manager
 		);
 		// track conversion with QM
 		sendEventContributionCheckoutConversion(
-			payment.originalAmount,
+			payment.originalAmount, // This is the amount before discounts
 			contributionType,
 			currencyKey,
 		);

support-frontend/assets/pages/supporter-plus-thank-you/supporterPlusThankYou.tsx

@@ -190,6 +190,7 @@ export function SupporterPlusThankYou({
 				contributionType,
 				currencyId,
 				paymentMethod,
+				isSupporterPlus ? 'SupporterPlus' : 'Contribution',
 			);
 			// track conversion with QM
 			sendEventContributionCheckoutConversion(