From 1e9b7f9fe925bfab0458df70a15ecc16e0a59f05 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Thu, 14 Sep 2017 18:53:05 +0530
Subject: [PATCH] Minor fixes

---
 CRM/Contribute/BAO/Contribution.php              | 6 ++----
 tests/phpunit/CRM/Member/Form/MembershipTest.php | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 7b6b39360c..8416ad9341 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -1832,18 +1832,16 @@ LEFT JOIN  civicrm_contribution contribution ON ( componentPayment.contribution_
       }
     }
     elseif ($contributionStatusId == array_search('Completed', $contributionStatuses)) {
-      $pending = array_search('Pending', $contributionStatuses);
-      $partaillyPaid = array_search('Partially paid', $contributionStatuses);
 
       // only pending contribution related object processed.
       if ($previousContriStatusId &&
-        (!in_array($previousContriStatusId, array($pending, $partaillyPaid)))
+        !in_array($contributionStatuses[$previousContriStatusId], array('Pending', 'Partially paid'))
       ) {
         // this is case when we already processed contribution object.
         return $updateResult;
       }
       elseif (!$previousContriStatusId &&
-        (!in_array($contribution->contribution_status_id, array($pending, $partaillyPaid)))
+        !in_array($contributionStatuses[$contribution->contribution_status_id], array('Pending', 'Partially paid'))
       ) {
         // this is case when we are going to process contribution object later.
         return $updateResult;
diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 5ad6286d54..084e0a4a22 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -883,7 +883,7 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
     //Update contribution to Partially paid.
     $prevContribution = $this->callAPISuccess('Contribution', 'create', array(
       'id' => $contribution['contribution_id'],
-      'contribution_status_id' => 8,
+      'contribution_status_id' => 'Partially paid',
     ));
     $prevContribution = $prevContribution['values'][1];
 
@@ -891,7 +891,7 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
     $form = new CRM_Contribute_Form_Contribution();
     $submitParams = array(
       'id' => $contribution['contribution_id'],
-      'contribution_status_id' => 1,
+      'contribution_status_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed'),
       'price_set_id' => 0,
     );
     $fields = array('total_amount', 'net_amount', 'financial_type_id', 'receive_date', 'contact_id', 'payment_instrument_id');
-- 
2.25.1