Merge pull request #19095 from nishant-bhorodia/Issue#537-owner-notification-email...
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 3 Dec 2020 20:11:06 +0000 (09:11 +1300)
committerGitHub <noreply@github.com>
Thu, 3 Dec 2020 20:11:06 +0000 (09:11 +1300)
Issue#537: Fix syntax to check pcp_id is NULL in api params

1  2 
CRM/Contribute/Form/Contribution.php

index c28a695d92ef3c6d9114f623c9a106029c70a1f1,3808fab0a184fd51862c2cc5e46cae544b757add..1fc9dc4063994da1cb40e7bd6b3483e13a3f8039
@@@ -1483,7 -1483,7 +1483,7 @@@ class CRM_Contribute_Form_Contribution 
  
      $isEmpty = array_keys(array_flip($submittedValues['soft_credit_contact_id']));
      if ($this->_id && count($isEmpty) == 1 && key($isEmpty) == NULL) {
-       civicrm_api3('ContributionSoft', 'get', ['contribution_id' => $this->_id, 'pcp_id' => NULL, 'api.ContributionSoft.delete' => 1]);
+       civicrm_api3('ContributionSoft', 'get', ['contribution_id' => $this->_id, 'pcp_id' => ['IS NULL' => 1], 'api.ContributionSoft.delete' => 1]);
      }
  
      // set the contact, when contact is selected
  
        // process associated membership / participant, CRM-4395
        if ($contribution->id && $action & CRM_Core_Action::UPDATE) {
 -        $this->statusMessage[] = CRM_Contribute_BAO_Contribution::transitionComponentWithReturnMessage($contribution->id,
 -          $contribution->contribution_status_id,
 -          CRM_Utils_Array::value('contribution_status_id',
 -            $this->_values
 -          ),
 -          $contribution->receive_date
 -        );
 +        CRM_Contribute_BAO_Contribution::transitionComponents([
 +          'contribution_id' => $contribution->id,
 +          'contribution_status_id' => $contribution->contribution_status_id,
 +          'previous_contribution_status_id' => $this->_values['contribution_status_id'] ?? NULL,
 +          'receive_date' => $contribution->receive_date,
 +        ]);
        }
  
        array_unshift($this->statusMessage, ts('The contribution record has been saved.'));