dev/core#1344 Fix logic for displaying BillingName and Credit Card De…

…tails in email Receipts
civicrm · Nov 1, 2019 · 1016611 · 1016611
1 parent be95ef1
commit 1016611
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
@@ -3450,8 +3450,6 @@ public function checkCreditCardDetails($mut, $contributionID) {
       'payment_processor_id' => $this->paymentProcessorID,
     ]);
     $mut->checkMailLog([
-      // credit card header
-      'Credit Card Information',
       // billing header
       'Billing Name and Address',
       // billing name

diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl
@@ -311,35 +311,33 @@
       </tr>
      {/if}
 
-     {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary}
-      {if $is_pay_later && !$isBillingAddressRequiredForPayLater}
+     {if $billingName}
        <tr>
         <th {$headerStyle}>
-         {ts}Registered Email{/ts}
+         {ts}Billing Name and Address{/ts}
         </th>
        </tr>
        <tr>
         <td colspan="2" {$valueStyle}>
+         {$billingName}<br />
+         {$address|nl2br}<br />
          {$email}
         </td>
        </tr>
-      {elseif $amount GT 0}
+     {elseif $email}
        <tr>
         <th {$headerStyle}>
-         {ts}Billing Name and Address{/ts}
+         {ts}Registered Email{/ts}
         </th>
        </tr>
        <tr>
         <td colspan="2" {$valueStyle}>
-         {$billingName}<br />
-         {$address|nl2br}<br />
          {$email}
         </td>
        </tr>
-      {/if}
      {/if}
 
-     {if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0}
+     {if $credit_card_type}
       <tr>
        <th {$headerStyle}>
         {ts}Credit Card Information{/ts}