Fix for dev/core#2624

Fix for dev/core#2624

diff --git a/CRM/Contribute/Page/ContributionRecur.php b/CRM/Contribute/Page/ContributionRecur.php
index 07f5f0fd7743a281288b7aa85779e5815620c0f4..65a1453eed3bfe9198316b4d86b73badfe667b35 100644 (file)
--- 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 a84499b3a74ece01dc7e4549a8155c24a37394bb..8ac8f2d12966f37461d9527ba280a771cfd0df94 100644 (file)
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -20,7 +20,11 @@
         <td class="label">{ts}From{/ts}</td>
         <td class="bold"><a href="{crmURL p='civicrm/contact/view' q="cid=`$recur.contact_id`"}">{$displayName}</a></td>
       </tr>
-      <tr><td class="label">{ts}Amount{/ts}</td><td>{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if}</td></tr>
+      {if $displayLineItems}
+        <tr><td class="label">{ts}Amount{/ts}</td><td>{include file="CRM/Price/Page/LineItem.tpl" context="ContributionRecur" totalAmount=$recur.amount currency=$recur.currency}</td></tr>
+      {else}
+        <tr><td class="label">{ts}Amount{/ts}</td><td>{$recur.amount|crmMoney:$recur.currency}{if $is_test} ({ts}test{/ts}){/if}</td></tr>
+      {/if}
       <tr><td class="label">{ts}Frequency{/ts}</td><td>every {$recur.frequency_interval} {$recur.frequency_unit}</td></tr>
       <tr><td class="label">{ts}Installments{/ts}</td><td>{$recur.installments}</td></tr>
       <tr><td class="label">{ts}Status{/ts}</td><td>{$recur.contribution_status}</td></tr>