Merge pull request #21379 from eileenmcnaughton/tok_mem

#2814 Fix membership pdf to use renderTemplate

CRM/Member/Form/Task/PDFLetter.php

@@ -145,12 +145,8 @@ class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
         'CRM_Contribution_Form_Task_PDFLetterCommon'
       );
 
-      $tokenHtml = CRM_Utils_Token::replaceContactTokens($html_message, $contacts[$contactId], TRUE, $messageToken);
-      $tokenHtml = CRM_Utils_Token::replaceEntityTokens('membership', $membership, $tokenHtml, $messageToken);
-      $tokenHtml = CRM_Utils_Token::replaceHookTokens($tokenHtml, $contacts[$contactId], $categories, TRUE);
-      $tokenHtml = CRM_Utils_Token::parseThroughSmarty($tokenHtml, $contacts[$contactId]);
-
-      $html[] = $tokenHtml;
+      $tokenHtml = CRM_Utils_Token::replaceEntityTokens('membership', $membership, $html_message, $messageToken);
+      $html[] = CRM_Core_BAO_MessageTemplate::renderTemplate(['messageTemplate' => ['msg_html' => $tokenHtml], 'contactId' => $contactId])['html'];
 
     }
     return $html;

CRM/Member/Form/Task/PDFLetterCommon.php

@@ -90,12 +90,8 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
         'CRM_Contribution_Form_Task_PDFLetterCommon'
       );
 
-      $tokenHtml = CRM_Utils_Token::replaceContactTokens($html_message, $contacts[$contactId], TRUE, $messageToken);
-      $tokenHtml = CRM_Utils_Token::replaceEntityTokens('membership', $membership, $tokenHtml, $messageToken);
-      $tokenHtml = CRM_Utils_Token::replaceHookTokens($tokenHtml, $contacts[$contactId], $categories, TRUE);
-      $tokenHtml = CRM_Utils_Token::parseThroughSmarty($tokenHtml, $contacts[$contactId]);
-
-      $html[] = $tokenHtml;
+      $tokenHtml = CRM_Utils_Token::replaceEntityTokens('membership', $membership, $html_message, $messageToken);
+      $html[] = CRM_Core_BAO_MessageTemplate::renderTemplate(['messageTemplate' => ['msg_html' => $tokenHtml], 'contactId' => $contactId])['html'];
 
     }
     return $html;

tests/phpunit/CRM/Member/Form/Task/PDFLetterCommonTest.php

@@ -84,6 +84,7 @@ class CRM_Member_Form_Task_PDFLetterCommonTest extends CiviUnitTestCase {
     // Assert all membership tokens are replaced correctly.
     $expected = array_values($expected);
     foreach ($expected as $key => $dateVal) {
+      $this->assertStringContainsString('Anthony', $testHTML[$key]);
       foreach ($tokens as $text => $token) {
         $this->assertStringContainsString($dateVal[$token], $testHTML[$key]);
       }
@@ -107,6 +108,7 @@ class CRM_Member_Form_Task_PDFLetterCommonTest extends CiviUnitTestCase {
     foreach ($tokens as $key => $val) {
       $html .= "<p>{$key} - {membership.{$val}}</p>";
     }
+    $html .= '{contact.first_name}';
     return [$tokens, $html];
   }