Simplify ContributionView form. Always display lineitems

diff --git a/CRM/Contribute/Form/ContributionView.php b/CRM/Contribute/Form/ContributionView.php
index 7d1094afcf10c1badef2e055925fff5edd921100..02b3ce815faab9df87b90de5c7f5042889b6e91f 100644 (file)
--- a/CRM/Contribute/Form/ContributionView.php
+++ b/CRM/Contribute/Form/ContributionView.php
@@ -141,26 +141,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
     }
 
     $lineItems = [CRM_Price_BAO_LineItem::getLineItemsByContributionID(($id))];
-    $firstLineItem = reset($lineItems[0]);
-    if (empty($firstLineItem['price_set_id'])) {
-      // CRM-20297 All we care is that it's not QuickConfig, so no price set
-      // is no problem.
-      $displayLineItems = TRUE;
-    }
-    else {
-      try {
-        $priceSet = civicrm_api3('PriceSet', 'getsingle', [
-          'id' => $firstLineItem['price_set_id'],
-          'return' => 'is_quick_config, id',
-        ]);
-        $displayLineItems = !$priceSet['is_quick_config'];
-      }
-      catch (CiviCRM_API3_Exception $e) {
-        throw new CRM_Core_Exception('Cannot find price set by ID');
-      }
-    }
     $this->assign('lineItem', $lineItems);
-    $this->assign('displayLineItems', $displayLineItems);
     $values['totalAmount'] = $values['total_amount'];
     $this->assign('displayLineItemFinancialType', TRUE);
 

diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl
index 5cc3f25ac67af01934b45261afb674a7bbbc6643..377ea50554b3b14303630cc92848d8bf24a0a8f9 100644 (file)
--- a/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -75,33 +75,18 @@
     <td>{if $receive_date}{$receive_date|crmDate}{else}({ts}not available{/ts}){/if}</td>
   </tr>
   {/if}
-  {if $displayLineItems}
-    <tr>
-      <td class="label">{ts}Contribution Amount{/ts}</td>
-      <td>{include file="CRM/Price/Page/LineItem.tpl" context="Contribution"}
-        {if $contribution_recur_id}
-          <a class="open-inline action-item crm-hover-button" href='{crmURL p="civicrm/contact/view/contributionrecur" q="reset=1&id=`$contribution_recur_id`&cid=`$contact_id`&context=contribution"}'>
-            {ts}View Recurring Contribution{/ts}
-          </a>
-          <br/>
-          {ts}Installments{/ts}: {if $recur_installments}{$recur_installments}{else}{ts}(ongoing){/ts}{/if}, {ts}Interval{/ts}: {$recur_frequency_interval} {$recur_frequency_unit}(s)
-        {/if}
-      </td>
-    </tr>
-  {else}
-    <tr>
-      <td class="label">{ts}Total Amount{/ts}</td>
-      <td><strong>{$total_amount|crmMoney:$currency}</strong>
+  <tr>
+    <td class="label">{ts}Contribution Amount{/ts}</td>
+    <td>{include file="CRM/Price/Page/LineItem.tpl" context="Contribution"}
         {if $contribution_recur_id}
           <a class="open-inline action-item crm-hover-button" href='{crmURL p="civicrm/contact/view/contributionrecur" q="reset=1&id=`$contribution_recur_id`&cid=`$contact_id`&context=contribution"}'>
-            {ts}View Recurring Contribution{/ts}
+              {ts}View Recurring Contribution{/ts}
           </a>
           <br/>
-          {ts}Installments{/ts}: {if $recur_installments}{$recur_installments}{else}{ts}(ongoing){/ts}{/if}, {ts}Interval{/ts}: {$recur_frequency_interval} {$recur_frequency_unit}(s)
+            {ts}Installments{/ts}: {if $recur_installments}{$recur_installments}{else}{ts}(ongoing){/ts}{/if}, {ts}Interval{/ts}: {$recur_frequency_interval} {$recur_frequency_unit}(s)
         {/if}
-      </td>
-    </tr>
-  {/if}
+    </td>
+  </tr>
   {if $invoicing && $tax_amount}
     <tr>
       <td class="label">{ts 1=$taxTerm}Total %1 Amount{/ts}</td>