Add contact greeting to membership online receipt text message templa…

…te, if exists, per civicrm#11674

CRM/Upgrade/Incremental/MessageTemplates.php

@@ -71,9 +71,11 @@ protected function getTemplateUpdates() {
     return [
       [
         'version' => '5.4.alpha1',
-        'template' => 'membership_online_receipt',
         'upgrade_descriptor' => ts('Use email greeting at top where available'),
-        'type' => 'text',
+        'templates' => [
+          ['name' => 'membership_online_receipt', 'type' => 'text'],
+          ['name' => 'membership_online_receipt', 'type' => 'html'],
+        ]
       ],
     ];
   }
@@ -86,9 +88,11 @@ protected function getTemplateUpdates() {
   public function getTemplatesToUpdate() {
     $templates = $this->getTemplateUpdates();
     $return = [];
-    foreach ($templates as $template) {
-      if ($template['version'] === $this->getUpgradeVersion()) {
-        $return[$template['template'] . '_' . $template['type']] = $template;
+    foreach ($templates as $templateArray) {
+      if ($templateArray['version'] === $this->getUpgradeVersion()) {
+        foreach ($templateArray['templates'] as $template) {
+          $return[$template['name'] . '_' . $template['type']] = $template;
+        }
       }
     }
     return $return;
@@ -113,9 +117,9 @@ public function updateTemplates() {
     $templates = $this->getTemplatesToUpdate();
     foreach ($templates as $template) {
       $workFlowID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) as id FROM civicrm_option_value WHERE name = %1", [
-        1 => [$template['template'], 'String'],
+        1 => [$template['name'], 'String'],
       ]);
-      $content = file_get_contents(\Civi::paths()->getPath('[civicrm.root]/xml/templates/message_templates/' . $template['template'] . '_' . $template['type'] . '.tpl'));
+      $content = file_get_contents(\Civi::paths()->getPath('[civicrm.root]/xml/templates/message_templates/' . $template['name'] . '_' . $template['type'] . '.tpl'));
       $templatesToUpdate = [];
       $templatesToUpdate[] = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_msg_template WHERE workflow_id = $workFlowID AND is_reserved = 1");
       $defaultTemplateID = CRM_Core_DAO::singleValueQuery("

xml/templates/message_templates/membership_online_receipt_text.tpl

@@ -1,3 +1,4 @@
+{if $contact.email_greeting}{$contact.email_greeting},{/if}
 {if $receipt_text}
 {$receipt_text}
 {/if}