From f5bf473718ec49e495b68471dbf5b7a03fa510e1 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 21 Nov 2023 13:15:11 +1300 Subject: [PATCH] A couple more minor fixes --- tests/phpunit/api/v3/ContributionPageTest.php | 6 +++--- .../message_templates/membership_online_receipt_html.tpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index ba7adb6385..4c3b79d7c6 100644 --- 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 0381eca200..9375ed21ef 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -179,18 +179,18 @@ {/if} - {if !empty($receive_date)} + {if {contribution.receive_date|boolean}} {ts}Date{/ts} - {$receive_date|crmDate} + {contribution.receive_date} {/if} - {if !empty($is_monetary) and !empty($trxn_id)} + {if !empty($trxn_id)} {ts}Transaction #{/ts} -- 2.25.1