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 cf6c5f0b6b5fdebe1f2335d5be1fa81c0af6de2e..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.                                    |
  |                                                                    |
@@ -56,7 +56,13 @@ function civicrm_api3_contribution_create(&$params) {
       throw new API_Exception($error['contribution_status_id']);
     }
   }
-
+  if (!empty($params['id']) && !empty($params['financial_type_id'])) {
+    $error = array();
+    CRM_Contribute_BAO_Contribution::checkFinancialTypeChange($params['financial_type_id'], $params['id'], $error);
+    if (array_key_exists('financial_type_id', $error)) {
+      throw new API_Exception($error['financial_type_id']);
+    }
+  }
   _civicrm_api3_contribution_create_legacy_support_45($params);
 
   // Make sure tax calculation is handled via api.
@@ -85,6 +91,7 @@ function _civicrm_api3_contribution_create_spec(&$params) {
     // field is called payment processor - not payment processor id but can only be one id so
     // it seems likely someone will fix it up one day to be more consistent - lets alias it from the start
     'api.aliases' => array('payment_processor_id'),
+    'type' => CRM_Utils_Type::T_INT,
   );
   $params['financial_type_id']['api.aliases'] = array('contribution_type_id', 'contribution_type');
   $params['financial_type_id']['api.required'] = 1;
@@ -245,9 +252,13 @@ function _civicrm_api3_format_soft_credit(&$contribution) {
  *   Array of parameters determined by getfields.
  */
 function _civicrm_api3_contribution_get_spec(&$params) {
-  $params['contribution_test']['api.default'] = 0;
-  $params['contribution_test']['title'] = 'Get Test Contributions?';
+  $params['contribution_test'] = array(
+    'api.default' => 0,
+    'type' => CRM_Utils_Type::T_BOOLEAN,
+    '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']);
@@ -363,22 +374,28 @@ function _civicrm_api3_contribution_sendconfirmation_spec(&$params) {
   $params['id'] = array(
     'api.required' => 1,
     'title' => 'Contribution ID',
+    'type' => CRM_Utils_Type::T_INT,
   );
   $params['receipt_from_email'] = array(
     'api.required' => 1,
     'title' => 'From Email address (string) required until someone provides a patch :-)',
+    'type' => CRM_Utils_Type::T_STRING,
   );
   $params['receipt_from_name'] = array(
     'title' => 'From Name (string)',
+    'type' => CRM_Utils_Type::T_STRING,
   );
   $params['cc_receipt'] = array(
     'title' => 'CC Email address (string)',
+    'type' => CRM_Utils_Type::T_STRING,
   );
   $params['bcc_receipt'] = array(
     'title' => 'BCC Email address (string)',
+    'type' => CRM_Utils_Type::T_STRING,
   );
   $params['receipt_text'] = array(
     'title' => 'Message (string)',
+    'type' => CRM_Utils_Type::T_STRING,
   );
 }
 
@@ -484,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);
   }
@@ -519,7 +537,8 @@ 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'];
   }
@@ -527,7 +546,7 @@ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstC
     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);
+      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);