From: Peter Haight <peterh@giantrabbit.com>
Date: Wed, 19 Nov 2014 23:57:59 +0000 (-0800)
Subject: CRM-15622: Fix for incorrect Fee Amount.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9b7e7d4c3abac6f11ab7bd41a6f07cd5fc340720;p=civicrm-core.git

CRM-15622: Fix for incorrect Fee Amount.

There's a bunch of fee_amount fields in this section of the code leading
to a lot of confusion (see CRM-15372). Many of the payment processors set
the fee_amount field in the result array they return which sets up the
contribution.fee_amount field, but the Authorize.Net AIM API doesn't
return fee information, so Authorize.Net doesn't set this field. Instead
of setting this field to 0 there, I thought it would be better to not
require that the payment processor set this field. Since some of the
payment processors return the same array that was passed into them and the
payment processors don't need the fee_amount field as an argument, I think
that setting that to NULL before passing it in gets us the correct output.

Note that we still need the fix from CRM-15372 to get the
participant.fee_amount field set correctly because the code that sets up
the pariticpant shares the field array that the contribution creation
uses even though they don't have the same 'fee_amount' field.
---

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index e89073f182..0dd64e126d 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1248,6 +1248,8 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task {
 
       $payment = CRM_Core_Payment::singleton($this->_mode, $this->_paymentProcessor, $this);
 
+      // CRM-15622: fix for incorrect contribution.fee_amount
+      $paymentParams['fee_amount'] = NULL;
       $result = $payment->doDirectPayment($paymentParams);
 
       if (is_a($result, 'CRM_Core_Error')) {