From ff123fcd1ebd241345cf51ee2ae6734b43292365 Mon Sep 17 00:00:00 2001
From: Shane <shaneonabike@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:25:57 -0500
Subject: [PATCH] dev/core#5578 Adding Recurring tokens to
 Contribution/Membership tokens available

---
 CRM/Contribute/Tokens.php | 2 +-
 CRM/Member/Tokens.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/Tokens.php b/CRM/Contribute/Tokens.php
index 625496528f87..66f6323646a1 100644
--- a/CRM/Contribute/Tokens.php
+++ b/CRM/Contribute/Tokens.php
@@ -79,7 +79,7 @@ protected function getRelatedTokens(): array {
     $contributionPageTokens = ['frontend_title', 'pay_later_text', 'pay_later_receipt', 'is_share', 'receipt_text'];
     $tokens += $this->getRelatedTokensForEntity('ContributionPage', 'contribution_page_id', $contributionPageTokens, ['is_share']);
 
-    $hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'next_sched_contribution_date', 'failure_count', 'failure_retry_date', 'auto_renew', 'is_email_receipt', 'contribution_status_id'];
+    $hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'auto_renew', 'is_email_receipt', 'contribution_status_id'];
     $tokens += $this->getRelatedTokensForEntity('ContributionRecur', 'contribution_recur_id', ['*'], $hiddenTokens);
     return $tokens;
   }
diff --git a/CRM/Member/Tokens.php b/CRM/Member/Tokens.php
index f6967644214f..badd17f8c0dd 100644
--- a/CRM/Member/Tokens.php
+++ b/CRM/Member/Tokens.php
@@ -144,7 +144,7 @@ protected function getBespokeTokens(): array {
    */
   protected function getRelatedTokens(): array {
     $tokens = [];
-    $hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'next_sched_contribution_date', 'failure_count', 'failure_retry_date', 'auto_renew', 'is_email_receipt', 'contribution_status_id'];
+    $hiddenTokens = ['modified_date', 'create_date', 'trxn_id', 'invoice_id', 'is_test', 'payment_token_id', 'payment_processor_id', 'payment_instrument_id', 'cycle_day', 'installments', 'processor_id', 'auto_renew', 'is_email_receipt', 'contribution_status_id'];
     $tokens += $this->getRelatedTokensForEntity('ContributionRecur', 'contribution_recur_id', ['*'], $hiddenTokens);
     $tokens += $this->getRelatedTokensForEntity('MembershipType', 'membership_type_id', ['minimum_fee']);
     $tokens += $this->getRelatedTokensForEntity('MembershipStatus', 'status_id', ['is_new']);