From 51e31e456972a68036f13bacdc51dbf76487c0e1 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Wed, 25 Jul 2018 04:38:46 +0530
Subject: [PATCH] Include inactive count and sort using is_test

---
 CRM/Contribute/Page/Tab.php           | 6 +++---
 templates/CRM/Contribute/Page/Tab.tpl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/Page/Tab.php b/CRM/Contribute/Page/Tab.php
index 5431bc8daf..0554008b5b 100644
--- a/CRM/Contribute/Page/Tab.php
+++ b/CRM/Contribute/Page/Tab.php
@@ -173,7 +173,7 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
       // assign vars to templates
       $this->assign('action', $this->_action);
       $this->assign('activeRecurRows', $activeContributions);
-      $this->assign('activeContributionsCount', $activeContributionsCount);
+      $this->assign('contributionRecurCount', $activeContributionsCount + $inactiveContributionsCount);
       $this->assign('inactiveRecurRows', $inactiveRecurringContributions);
       $this->assign('recur', TRUE);
     }
@@ -190,7 +190,7 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
       $contributionRecurResult = civicrm_api3('ContributionRecur', 'get', array(
         'contact_id' => $this->_contactId,
         'contribution_status_id' => array('NOT IN' => CRM_Contribute_BAO_ContributionRecur::getInactiveStatuses()),
-        'options' => array('limit' => 0, 'sort' => 'start_date ASC'),
+        'options' => ['limit' => 0, 'sort' => 'is_test, start_date ASC'],
       ));
       $recurContributions = CRM_Utils_Array::value('values', $contributionRecurResult);
     }
@@ -212,7 +212,7 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
       $contributionRecurResult = civicrm_api3('ContributionRecur', 'get', array(
         'contact_id' => $this->_contactId,
         'contribution_status_id' => array('IN' => CRM_Contribute_BAO_ContributionRecur::getInactiveStatuses()),
-        'options' => array('limit' => 0, 'sort' => 'start_date ASC'),
+        'options' => ['limit' => 0, 'sort' => 'is_test, start_date ASC'],
       ));
       $recurContributions = CRM_Utils_Array::value('values', $contributionRecurResult);
     }
diff --git a/templates/CRM/Contribute/Page/Tab.tpl b/templates/CRM/Contribute/Page/Tab.tpl
index f4617bfd89..cc923336ac 100644
--- a/templates/CRM/Contribute/Page/Tab.tpl
+++ b/templates/CRM/Contribute/Page/Tab.tpl
@@ -51,7 +51,7 @@
           </li>
           <li id="tab_recurring" class="crm-tab-button ui-corner-all ui-tabs-tab ui-corner-top ui-state-default ui-tab">
             <a href="#recurring-subtab" title="{ts}Recurring Contributions{/ts}">
-              {ts}Recurring Contributions{/ts} <em>{$activeContributionsCount}</em>
+              {ts}Recurring Contributions{/ts} <em>{$contributionRecurCount}</em>
             </a>
           </li>
         </ul>
-- 
2.25.1