From 2d8add95211834edba38c9b7b59a5a43c2347d79 Mon Sep 17 00:00:00 2001 From: Jaap Jansma Date: Thu, 27 May 2021 10:33:09 +0200 Subject: [PATCH] Fix for dev/core#2624 Fix for dev/core#2624 --- CRM/Contribute/Page/ContributionRecur.php | 11 +++++++++++ templates/CRM/Contribute/Page/ContributionRecur.tpl | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/Page/ContributionRecur.php b/CRM/Contribute/Page/ContributionRecur.php index 07f5f0fd77..65a1453eed 100644 --- a/CRM/Contribute/Page/ContributionRecur.php +++ b/CRM/Contribute/Page/ContributionRecur.php @@ -75,6 +75,17 @@ class CRM_Contribute_Page_ContributionRecur extends CRM_Core_Page { $this->assign('recur', $contributionRecur); + $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($this->getEntityId()); + + $lineItems = []; + $displayLineItems = FALSE; + if (!empty($templateContribution['id'])) { + $lineItems = [CRM_Price_BAO_LineItem::getLineItemsByContributionID(($templateContribution['id']))]; + $displayLineItems = TRUE; + } + $this->assign('lineItem', $lineItems); + $this->assign('displayLineItems', $displayLineItems); + $displayName = CRM_Contact_BAO_Contact::displayName($contributionRecur['contact_id']); $this->assign('displayName', $displayName); diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl index a84499b3a7..8ac8f2d129 100644 --- a/templates/CRM/Contribute/Page/ContributionRecur.tpl +++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl @@ -20,7 +20,11 @@ {ts}From{/ts} {$displayName} - {ts}Amount{/ts}{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if} + {if $displayLineItems} + {ts}Amount{/ts}{include file="CRM/Price/Page/LineItem.tpl" context="ContributionRecur" totalAmount=$recur.amount currency=$recur.currency} + {else} + {ts}Amount{/ts}{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if} + {/if} {ts}Frequency{/ts}every {$recur.frequency_interval} {$recur.frequency_unit} {ts}Installments{/ts}{$recur.installments} {ts}Status{/ts}{$recur.contribution_status} -- 2.25.1