A couple more minor fixes

diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index ba7adb63853a3ff33845f6d88256a828bc894424..4c3b79d7c6a1be145588d8d20555de7e7d5abf6f 100644 (file)
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -425,9 +425,9 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase {
     $this->assertEquals($membership['contact_id'], $contributions[$membershipPayment['contribution_id']]['contact_id']);
     $mut->checkMailLog([
       'Gruff',
-      'General Membership',
-      '$0.00',
-      'Membership Fee',
+      'General',
+      'Membership Information',
+      'Membership Type',
     ]);
     $mut->stop();
     $mut->clearMessages();

diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
index 0381eca2005074cd1cf18d833fb99258b4de82bc..9375ed21efc5657333f3bee18618a03653b14f1e 100644 (file)
--- a/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -179,18 +179,18 @@
       </tr>
     {/if}
 
-    {if !empty($receive_date)}
+    {if {contribution.receive_date|boolean}}
       <tr>
         <td {$labelStyle}>
           {ts}Date{/ts}
         </td>
         <td {$valueStyle}>
-          {$receive_date|crmDate}
+          {contribution.receive_date}
         </td>
       </tr>
     {/if}
 
-    {if !empty($is_monetary) and !empty($trxn_id)}
+    {if !empty($trxn_id)}
       <tr>
        <td {$labelStyle}>
         {ts}Transaction #{/ts}