(dev/core/56) Cancel Recurring Contribution activity should has a source record id

[scardinius]

Overview

Cancel Recurring Contribution doesn't have a source record id but there should be a recurring contribution id

Before

civicrm_activity.record_source_id IS NULL

After

civicrm_activity.record_source_id has a recurring contribution id

Technical Details

// current, invalid
'source_record_id' => CRM_Utils_Array::value('source_record_id', $activityParams),
// fixed
'source_record_id' => $dao->recur_id,

Comments

Link to gitlab https://lab.civicrm.org/dev/core/issues/56

[eileenmcnaughton]

test this please

[eileenmcnaughton]

I checked the places this is called from

1. $objects is null, $activity_params does not contain 'source_record_id'

      $activityParams
        = array(
          'subject' => $this->_mid ? ts('Auto-renewal membership cancelled') : ts('Recurring contribution cancelled'),
          'details' => $message,
        );
      $cancelStatus = CRM_Contribute_BAO_ContributionRecur::cancelRecurContribution(
        $this->_subscriptionDetails->recur_id,
        NULL,
        $activityParams
      );

2. object & activity params are both null

  return CRM_Contribute_BAO_ContributionRecur::cancelRecurContribution($params['id'], CRM_Core_DAO::$_nullObject) ? civicrm_api3_create_success() : civicrm_api3_create_error(ts('Error while cancelling recurring contribution'));

3. object & activity params are both null

    CRM_Contribute_BAO_ContributionRecur::cancelRecurContribution($contributionRecur['id'], NULL);

Am giving this merge on pass as I agree that source_record_id is not currently populated & the recur record makes sense.

Will do follow up to remove $objects

[seamuslee001]

Merging as per the tag