CRM-16923 pass payment processor in when calling completetransaction

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 0eb153667622368268474336e3760004b91e9c04..c86eb49f041fa550365cc271d78bd75a3fd4696c 100644 (file)
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1242,7 +1242,11 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
          * = error or success, unless it is a recurring contribution in which case it is pending.
          */
         if ($result['payment_status_id'] == array_search('Completed', $statuses)) {
-          civicrm_api3('contribution', 'completetransaction', array('id' => $contribution->id, 'trxn_id' => $result['trxn_id']));
+          civicrm_api3('contribution', 'completetransaction', array(
+            'id' => $contribution->id,
+            'trxn_id' => $result['trxn_id'],
+            'payment_processor_id' => $this->_paymentProcessor['id'],
+          ));
         }
         else {
           // Save the trxn_id.

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index e94d9d178aacb903f1a0bb0933abd0ad119f23e9..a8e4da5e0ded51d0b6aecda104ed9d322777238e 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1704,6 +1704,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
             'id' => $paymentResult['contribution']->id,
             'trxn_id' => $paymentResult['contribution']->trxn_id,
             'is_transactional' => FALSE,
+            'payment_processor_id' => $form->_paymentProcessor['id'],
           ));
         }
         catch (CiviCRM_API3_Exception $e) {
@@ -2309,6 +2310,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
         civicrm_api3('contribution', 'completetransaction', array(
           'id' => $result['contribution']->id,
           'trxn_id' => CRM_Utils_Array::value('trxn_id', $result),
+          'payment_processor_id' => $this->_paymentProcessor['id'],
           )
         );
       }

diff --git a/api/v3/examples/ContributionPage/Submit.php b/api/v3/examples/ContributionPage/Submit.php
index 5a6d2ff093e28c783766d4296088ca897fe8f070..92660e1030f3ff9d8fb96eced2d2744bd6de52c4 100644 (file)
--- a/api/v3/examples/ContributionPage/Submit.php
+++ b/api/v3/examples/ContributionPage/Submit.php
@@ -19,7 +19,7 @@ function contribution_page_submit_example() {
     'selectMembership' => array(
       '0' => 1,
     ),
-    'payment_processor' => 1,
+    'payment_processor_id' => 1,
     'credit_card_number' => '4111111111111111',
     'credit_card_type' => 'Visa',
     'credit_card_exp_date' => array(

diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index 3206a83a2ae0bb7daf543fd2a09561cccd323823..009d3c9684ff9c0e97e0aa7244c8772646891627 100644 (file)
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -402,6 +402,7 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase {
     $this->callAPISuccess('contribution', 'completetransaction', array(
       'id' => $contribution['id'],
       'trxn_id' => 'ipn_called',
+      'payment_processor_id' => $this->_paymentProcessor['id'],
     ));
     $membership = $this->callAPISuccessGetSingle('membership', array('id' => $membershipPayment['membership_id']));
     //renew it with processor setting completed - should extend membership