From 060c14e981cf9846477c2b1cd5603c255694acb7 Mon Sep 17 00:00:00 2001
From: PraveenMathew92 <pmathew4@asu.edu>
Date: Wed, 29 Nov 2023 15:00:33 -0700
Subject: [PATCH] + (Finance) Fixed issue of attribute values not being
 populated in custom workflows triggered by Giving Automation Alert.

---
 Rock/Tasks/ProcessTransactionAlertActions.cs              | 3 ++-
 RockWeb/Blocks/Finance/GivingAutomationConfiguration.ascx | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Rock/Tasks/ProcessTransactionAlertActions.cs b/Rock/Tasks/ProcessTransactionAlertActions.cs
index 1a242609268..4114b5b3fb3 100644
--- a/Rock/Tasks/ProcessTransactionAlertActions.cs
+++ b/Rock/Tasks/ProcessTransactionAlertActions.cs
@@ -81,8 +81,9 @@ public override void Execute( Message message )
                     var workflowAttributeValues = new Dictionary<string, string>();
                     workflowAttributeValues.Add( nameof( FinancialTransactionAlert ), alert.Guid.ToString() );
                     workflowAttributeValues.Add( nameof( FinancialTransactionAlertType ), alertType.Guid.ToString() );
+                    workflowAttributeValues.Add( "FinancialTransactionId", alert.FinancialTransaction.Id.ToStringSafe() );
                     workflowAttributeValues.Add( nameof( Person ), person.Guid.ToString() );
-                    alert.LaunchWorkflow( alertType.WorkflowTypeId, string.Empty, workflowAttributeValues, null );
+                    alert.LaunchWorkflow( alertType.WorkflowTypeId, string.Empty, workflowAttributeValues, alert.PersonAliasId );
                 }
 
                 // Add the person to a connection opportunity if configured
diff --git a/RockWeb/Blocks/Finance/GivingAutomationConfiguration.ascx b/RockWeb/Blocks/Finance/GivingAutomationConfiguration.ascx
index fd1f20a4b68..fe7d0119dd9 100644
--- a/RockWeb/Blocks/Finance/GivingAutomationConfiguration.ascx
+++ b/RockWeb/Blocks/Finance/GivingAutomationConfiguration.ascx
@@ -293,7 +293,7 @@
                     </div>
 
                     <div class="panel-body">
-                        <Rock:WorkflowTypePicker ID="wtpLaunchWorkflow" runat="server" Label="Launch Workflow of Type" ValidationGroup="vgAlertDetails" Help="If matched, a workflow of the provided type will be launched setting the authorized person as the initiator and setting the attribute with the key of 'FinancialTransactionId' is it exists" />
+                        <Rock:WorkflowTypePicker ID="wtpLaunchWorkflow" runat="server" Label="Launch Workflow of Type" ValidationGroup="vgAlertDetails" Help="If matched, the selected workflow will be launched setting the workflow 'Initiator' as the financial transaction's 'authorized' person, and setting the attribute value with key  'FinancialTransactionId' (if it exists) to the financial transaction's Id." />
                         <Rock:RockDropDownList ID="ddlConnectionType" runat="server" Label="Connection Type" AutoPostBack="true" ValidationGroup="vgAlertDetails" OnSelectedIndexChanged="ddlConnectionType_SelectedIndexChanged" CssClass="input-width-xxl" />
                         <Rock:RockDropDownList ID="ddlConnectionOpportunity" runat="server" Label="Connection Opportunity" ValidationGroup="vgAlertDetails" CssClass="input-width-xxl" Help="If matched, will create a new connection request with the authorized person as the requestor and setting the attribute with the key 'FinancialTransactionId' if it exists." />
                         <Rock:RockDropDownList ID="ddlDonorSystemCommunication" runat="server" Label="Send Donor Communication From Template" Help="If matched, a new communication will be sent to the person authorizing the gift using the provided communication template." ValidationGroup="vgAlertDetails" />