From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 26 Mar 2021 03:26:06 +0000 (+1300)
Subject: Move tpl assignment to email function
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6c2ee06366372d23d204a5f40df68a9c4b8e75cb;p=civicrm-core.git

Move tpl assignment to email function
---

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index c435bde729..6f7bbf7bac 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1072,10 +1072,6 @@ DESC limit 1");
         $params['receipt_date'] = $formValues['receive_date'] ?? NULL;
       }
 
-      //insert financial type name in receipt.
-      $formValues['contributionType_name'] = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType',
-        $this->getFinancialTypeID()
-      );
     }
 
     // process line items, until no previous line items.
@@ -1600,6 +1596,10 @@ DESC limit 1");
       $this->assign('is_pay_later', 0);
       $this->assign('isPrimary', 1);
     }
+    //insert financial type name in receipt.
+    $formValues['contributionType_name'] = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType',
+      $this->getFinancialTypeID()
+    );
     return $this->emailReceipt($this, $formValues, $membership);
   }