Merge pull request #14353 from eileenmcnaughton/fin_accounts_pi
authorMonish Deb <deb.monish@gmail.com>
Sat, 1 Jun 2019 07:59:16 +0000 (13:29 +0530)
committerGitHub <noreply@github.com>
Sat, 1 Jun 2019 07:59:16 +0000 (13:29 +0530)
[REF] Remove reference to 'changePaymentInstrument' from  updateFinancialAccounts as never passed in

1  2 
CRM/Contribute/BAO/Contribution.php

index 8b7d72b7be3f48e624150c84b348aac5256e4417,65d78c49193a789babedca7e2af9825f203b01f3..6a81bc618587c6185fa16adca845ee3499201015
@@@ -3756,16 -3757,9 +3756,9 @@@ INNER JOIN civicrm_activity ON civicrm_
      $trxnID = NULL;
      $inputParams = $params;
      $isARefund = FALSE;
 -    $currentContributionStatus = CRM_Core_PseudoConstant::getLabel('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $params['contribution']->contribution_status_id);
 +    $currentContributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $params['contribution']->contribution_status_id);
      $previousContributionStatus = CRM_Contribute_PseudoConstant::contributionStatus($params['prevContribution']->contribution_status_id, 'name');
  
-     if (($previousContributionStatus == 'Pending'
-         || $previousContributionStatus == 'In Progress')
-       && $currentContributionStatus == 'Completed'
-       && $context == 'changePaymentInstrument'
-     ) {
-       return;
-     }
      if ($context == 'changedStatus') {
        list($continue, $isARefund) = self::updateFinancialAccountsOnContributionStatusChange($params, $context, $previousContributionStatus, $currentContributionStatus);
        // @todo - it may be that this is always false & the parent function is just a confusing wrapper for the child fn.