From c2047803a836b4fb9c8cc96b38f7e418535f863a Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Wed, 2 May 2018 00:26:12 +0000
Subject: [PATCH] CRM-50: Move Inactive Statuses Array to BAO

And added class selectors to each div containing active and inactive recurring
contributions.
---
 CRM/Contribute/BAO/ContributionRecur.php | 17 +++++++++++++++++
 CRM/Contribute/Page/Tab.php              | 11 ++---------
 templates/CRM/Contribute/Page/Tab.tpl    |  4 ++--
 3 files changed, 21 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 CRM/Contribute/BAO/ContributionRecur.php
 mode change 100644 => 100755 CRM/Contribute/Page/Tab.php
 mode change 100644 => 100755 templates/CRM/Contribute/Page/Tab.tpl

diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
old mode 100644
new mode 100755
index 3049402ea5..86c34efa15
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -32,6 +32,13 @@
  */
 class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_ContributionRecur {
 
+  /**
+   * Array with statuses that mark a recurring contribution as inactive.
+   *
+   * @var array
+   */
+  private static $inactiveStatuses = array('Cancelled', 'Chargeback', 'Refunded', 'Completed');
+
   /**
    * Create recurring contribution.
    *
@@ -938,4 +945,14 @@ INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
     return $lineSets;
   }
 
+  /**
+   * Returns array with statuses that are considered to make a recurring
+   * contribution inacteve.
+   *
+   * @return array
+   */
+  public static function getInactiveStatuses() {
+    return self::$inactiveStatuses;
+  }
+
 }
diff --git a/CRM/Contribute/Page/Tab.php b/CRM/Contribute/Page/Tab.php
old mode 100644
new mode 100755
index 5e303e23a6..5b567c2906
--- a/CRM/Contribute/Page/Tab.php
+++ b/CRM/Contribute/Page/Tab.php
@@ -43,13 +43,6 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
   public $_contactId = NULL;
   public $_crid = NULL;
 
-  /**
-   * Array with statuses that mark a recurring contribution as inactive.
-   *
-   * @var array
-   */
-  private $inactiveStatuses = array('Cancelled', 'Chargeback', 'Refunded', 'Completed');
-
   /**
    * This method returns the links that are given for recur search row.
    * currently the links added for each row are:
@@ -195,7 +188,7 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
     try {
       $contributionRecurResult = civicrm_api3('ContributionRecur', 'get', array(
         'contact_id' => $this->_contactId,
-        'contribution_status_id' => array('NOT IN' => $this->inactiveStatuses),
+        'contribution_status_id' => array('NOT IN' => CRM_Contribute_BAO_ContributionRecur::getInactiveStatuses()),
         'options' => array('limit' => 0, 'sort' => 'start_date ASC'),
       ));
       $recurContributions = CRM_Utils_Array::value('values', $contributionRecurResult);
@@ -217,7 +210,7 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
     try {
       $contributionRecurResult = civicrm_api3('ContributionRecur', 'get', array(
         'contact_id' => $this->_contactId,
-        'contribution_status_id' => array('IN' => $this->inactiveStatuses),
+        'contribution_status_id' => array('IN' => CRM_Contribute_BAO_ContributionRecur::getInactiveStatuses()),
         'options' => array('limit' => 0, 'sort' => '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
old mode 100644
new mode 100755
index ffa4a7ea2d..9c596efb82
--- a/templates/CRM/Contribute/Page/Tab.tpl
+++ b/templates/CRM/Contribute/Page/Tab.tpl
@@ -103,11 +103,11 @@
         </div>
         <div id="recurring-subtab" class="ui-tabs-panel ui-widget-content ui-corner-bottom">
           {if $recur}
-            <div class="crm-block crm-contact-contribute-recur">
+            <div class="crm-block crm-contact-contribute-recur crm-contact-contribute-recur-active">
               <h3>{ts}Active Recurring Contributions{/ts}</h3>
               {include file="CRM/Contribute/Page/ContributionRecur.tpl" recurRows=$activeRecurRows}
             </div>
-            <div class="crm-block crm-contact-contribute-recur">
+            <div class="crm-block crm-contact-contribute-recur crm-contact-contribute-recur-inactive">
               <h3>{ts}Inactive Recurring Contributions{/ts}</h3>
               {include file="CRM/Contribute/Page/ContributionRecur.tpl" recurRows=$inactiveRecurRows}
             </div>
-- 
2.25.1