Merge pull request #5901 from colemanw/CRM-16557

[civicrm-core.git] / api / v3 / Contribution.php

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index aa385a0fdaa430ce5cf2243138d70bb769e45675..b19302837e08137739c1af25341a03fa272f1b6f 100644 (file)
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -258,6 +258,7 @@ function _civicrm_api3_contribution_get_spec(&$params) {
     'title' => 'Get Test Contributions?',
   );
   $params['financial_type_id']['api.aliases'] = array('contribution_type_id');
+  $params['payment_instrument_id']['api.aliases'] = array('contribution_payment_instrument', 'payment_instrument');
   $params['contact_id'] = $params['contribution_contact_id'];
   $params['contact_id']['api.aliases'] = array('contribution_contact_id');
   unset($params['contribution_contact_id']);
@@ -456,6 +457,16 @@ function _civicrm_api3_contribution_completetransaction_spec(&$params) {
     'title' => 'Send email Receipt?',
     'type' => CRM_Utils_Type::T_BOOLEAN,
   );
+  $params['receipt_from_email'] = array(
+    'title' => 'Email to send receipt from.',
+    'description' => 'If not provided this will default to being based on domain mail or contribution page',
+    'type' => CRM_Utils_Type::T_EMAIL,
+  );
+  $params['receipt_from_name'] = array(
+    'title' => 'Name to send receipt from',
+    'description' => '. If not provided this will default to domain mail or contribution page',
+    'type' => CRM_Utils_Type::T_STRING,
+  );
 }
 
 /**
@@ -490,8 +501,9 @@ function civicrm_api3_contribution_repeattransaction(&$params) {
     unset($contribution->id, $contribution->receive_date, $contribution->invoice_id);
     $contribution->contribution_status_id = $params['contribution_status_id'];
     $contribution->receive_date = $params['receive_date'];
-    // Have not set trxn_id to required but an e-notice if not provided seems appropriate.
-    $input['trxn_id'] = $params['trxn_id'];
+
+    $passThroughParams = array('trxn_id', 'total_amount', 'campaign_id', 'fee_amount');
+    $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 
     $params = _ipn_process_transaction($params, $contribution, $input, $ids, $original_contribution);
   }
@@ -525,10 +537,20 @@ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstC
   }
   $input['component'] = $contribution->_component;
   $input['is_test'] = $contribution->is_test;
-  $input['amount'] = $contribution->total_amount;
+  $input['amount'] = empty($input['total_amount']) ? $contribution->total_amount : $input['total_amount'];
+
   if (isset($params['is_email_receipt'])) {
     $input['is_email_receipt'] = $params['is_email_receipt'];
   }
+  if (empty($contribution->contribution_page_id)) {
+    static $domainFromName;
+    static $domainFromEmail;
+    if (empty($domainFromEmail) && (empty($params['receipt_from_name']) || empty($params['receipt_from_email']))) {
+      list($domainFromName, $domainFromEmail) = CRM_Core_BAO_Domain::getNameAndEmail(TRUE);
+    }
+    $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);
+  }
   // @todo required for base ipn but problematic as api layer handles this
   $transaction = new CRM_Core_Transaction();
   $ipn = new CRM_Core_Payment_BaseIPN();