From 1c4160c32df28783f1bc2c4f2b45a09c93b2d715 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 3 Sep 2021 16:39:23 +1200
Subject: [PATCH] Use new template contract for recurring edit

---
 CRM/Contribute/Form/UpdateSubscription.php    | 15 ++------
 .../WorkflowMessage/RecurringEdit.php         | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 CRM/Contribute/WorkflowMessage/RecurringEdit.php

diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php
index 1d305c8a28..2c0bff4152 100644
--- a/CRM/Contribute/Form/UpdateSubscription.php
+++ b/CRM/Contribute/Form/UpdateSubscription.php
@@ -286,28 +286,19 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
 
         [$donorDisplayName, $donorEmail] = CRM_Contact_BAO_Contact::getContactDetails($contactID);
 
-        $tplParams = [
-          'recur_frequency_interval' => $this->_subscriptionDetails->frequency_interval,
-          'recur_frequency_unit' => $this->_subscriptionDetails->frequency_unit,
-          'amount' => CRM_Utils_Money::format($params['amount']),
-          'installments' => $params['installments'],
-        ];
-
-        $tplParams['contact'] = ['display_name' => $donorDisplayName];
-        $tplParams['receipt_from_email'] = $receiptFrom;
-
         $sendTemplateParams = [
           'groupName' => 'msg_tpl_workflow_contribution',
           'valueName' => 'contribution_recurring_edit',
           'contactId' => $contactID,
-          'tplParams' => $tplParams,
+          'tplParams' => ['receipt_from_email' => $receiptFrom],
           'isTest' => $this->_subscriptionDetails->is_test,
           'PDFFilename' => 'receipt.pdf',
           'from' => $receiptFrom,
           'toName' => $donorDisplayName,
           'toEmail' => $donorEmail,
+          'tokenContext' => ['contribution_recurId' => $this->getContributionRecurID()],
         ];
-        [$sent] = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
+        CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
       }
     }
 
diff --git a/CRM/Contribute/WorkflowMessage/RecurringEdit.php b/CRM/Contribute/WorkflowMessage/RecurringEdit.php
new file mode 100644
index 0000000000..3af455351e
--- /dev/null
+++ b/CRM/Contribute/WorkflowMessage/RecurringEdit.php
@@ -0,0 +1,35 @@
+<?php
+
+class CRM_Contribute_WorkflowMessage_RecurringEdit extends Civi\WorkflowMessage\GenericWorkflowMessage {
+  const WORKFLOW = 'contribution_recurring_edit';
+
+  /**
+   * The recurring contribution contact.
+   *
+   * @var array|null
+   *
+   * @scope tokenContext
+   *
+   * @required
+   */
+  public $contact;
+
+  /**
+   * The recurring contribution.
+   *
+   * @var array|null
+   *
+   * @scope tokenContext
+   *
+   * @required
+   */
+  public $contribution_recur;
+
+  protected function exportExtraTokenContext(array &$export): void {
+    $export['smartyTokenAlias']['installments'] = 'contribution_recur.installments';
+    $export['smartyTokenAlias']['amount'] = 'contribution_recur.amount';
+    $export['smartyTokenAlias']['recur_frequency_unit'] = 'contribution_recur.frequency_unit';
+    $export['smartyTokenAlias']['recur_frequency_interval'] = 'contribution_recur.frequency_interval';
+  }
+
+}
-- 
2.25.1