ensure correct payment_instrument_id

[jmcclelland]

https://lab.civicrm.org/dev/core/issues/7

Otherwise, after first recurring contribution, contributions are coded
as check, not credit card.

Overview

Ensure the correct payment instrument is assigned to recurring authorize.net contributions (after the initial one).

Before

After the initial recurring contribution, subsequent contributions are coded as payment instrument check, instead of credit card.

After

Subsequent contributions are coded as payment instrument credit card.

Technical Details

I took the path of least resistance and I'm not sure it's the correct one. In particular I'm suspicious of the code in CRM/Contribute/BAO/Contribution.php on line 4571:

    // If paymentProcessor is not set then the payment_instrument_id would not be correct.
    // not clear when or if this would occur if you encounter this please fix here & add a unit test.
    if (empty($contributionParams['payment_instrument_id']) && isset($contribution->_relatedObjects['paymentProcessor']['payment_instrument_id'])) {
      $contributionParams['payment_instrument_id'] = $contribution->_relatedObjects['paymentProcessor']['payment_instrument_id'];
    }

Maybe this code should just check for $contribution->payment_instrument_id and use that value if present?

[seamuslee001]

ping @eileenmcnaughton

[eileenmcnaughton]

It's not pretty but I think it makes sense & the test is adequate IMHO.