CRM-19621 fix receipts on separate membership payments to not have ex…

…traneous line. The additional line is arguably better in some use-cases, but weird from the point of view that the line is covered in a separate email as well. It is also technically more difficult & fragile so I am removing it.
civicrm · Dec 1, 2016 · b5c6c4a · b5c6c4a
1 parent 85c8c9e
commit b5c6c4a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 40 deletions.
diff --git a/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_html.tpl b/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_html.tpl
@@ -101,25 +101,16 @@
            {$amount|crmMoney}
           </td>
          </tr>
-        {else}
+       {/if}
          <tr>
           <td {$labelStyle}>
-           {ts}Additional Contribution{/ts}
-          </td>
-          <td {$valueStyle}>
-           {$amount|crmMoney}
-          </td>
+             {ts}Total{/ts}
+           </td>
+           <td {$valueStyle}>
+             {$amount+$membership_amount|crmMoney}
+           </td>
          </tr>
-        {/if}
        {/if}
-       <tr>
-        <td {$labelStyle}>
-         {ts}Total{/ts}
-        </td>
-        <td {$valueStyle}>
-         {$amount+$membership_amount|crmMoney}
-        </td>
-       </tr>
 
       {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config}
 

diff --git a/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_text.tpl b/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_text.tpl
@@ -33,12 +33,10 @@
 {if $amount}
 {if ! $is_separate_payment }
 {ts}Contribution Amount{/ts}: {$amount|crmMoney}
-{else}
-{ts}Additional Contribution{/ts}: {$amount|crmMoney}
-{/if}
-{/if}
 -------------------------------------------
 {ts}Total{/ts}: {$amount+$membership_amount|crmMoney}
+{/if}
+{/if}
 {elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config}
 {foreach from=$lineItem item=value key=priceset}
 ---------------------------------------------------------

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -101,25 +101,16 @@
            {$amount|crmMoney}
           </td>
          </tr>
-        {else}
          <tr>
-          <td {$labelStyle}>
-           {ts}Additional Contribution{/ts}
-          </td>
-          <td {$valueStyle}>
-           {$amount|crmMoney}
-          </td>
+           <td {$labelStyle}>
+           {ts}Total{/ts}
+            </td>
+            <td {$valueStyle}>
+            {$amount+$membership_amount|crmMoney}
+           </td>
          </tr>
         {/if}
-       {/if}
-       <tr>
-        <td {$labelStyle}>
-         {ts}Total{/ts}
-        </td>
-        <td {$valueStyle}>
-         {$amount+$membership_amount|crmMoney}
-        </td>
-       </tr>
+      {/if}
 
       {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config}
 

diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl
@@ -33,12 +33,10 @@
 {if $amount}
 {if ! $is_separate_payment }
 {ts}Contribution Amount{/ts}: {$amount|crmMoney}
-{else}
-{ts}Additional Contribution{/ts}: {$amount|crmMoney}
-{/if}
-{/if}
 -------------------------------------------
 {ts}Total{/ts}: {$amount+$membership_amount|crmMoney}
+{/if}
+{/if}
 {elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config}
 {foreach from=$lineItem item=value key=priceset}
 ---------------------------------------------------------