Merge pull request #10157 from eileenmcnaughton/iida3

CRM-20264, Added Card type and Pan Truncation form fields on Payment …

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Contribute/Form/AbstractEditPayment.php
Simple merge

diff --cc api/v3/Contribution.php
index 4148ca54c88744564c789f7e8b430aa85e483ff2,aa58066f25127da0ddc479387ddb04f87d8a2efa..033091ce39b77d1ef6c1ec5d6bce05355776c13b
--- 1/api/v3/Contribution.php
--- 2/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@@ -693,9 -708,12 +708,11 @@@ function _ipn_process_transaction(&$par
      $input['receipt_from_name'] = CRM_Utils_Array::value('receipt_from_name', $params, $domainFromName);
      $input['receipt_from_email'] = CRM_Utils_Array::value('receipt_from_email', $params, $domainFromEmail);
    }
+   $input['card_type_id'] = CRM_Utils_Array::value('card_type_id', $params);
+   $input['pan_truncation'] = CRM_Utils_Array::value('pan_truncation', $params);
    $transaction = new CRM_Core_Transaction();
    return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects, $transaction, !empty
 -  ($contribution->contribution_recur_id), $contribution,
 -    FALSE, FALSE);
 +  ($contribution->contribution_recur_id), $contribution);
  }
  
  /**