Merge branch 'angular-tests' of https://github.com/giant-rabbit/civicrm-core into...

[civicrm-core.git] / bin / ContributionProcessor.php

diff --git a/bin/ContributionProcessor.php b/bin/ContributionProcessor.php
index f2c91ce99bdb32778121eea9b54ac1323ee6f4a6..3cb3ae3a3007f34950f274527bcbb3596aaa5357 100644 (file)
--- a/bin/ContributionProcessor.php
+++ b/bin/ContributionProcessor.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -136,6 +136,12 @@ class CiviContributeProcessor {
     ),
   );
 
+  /**
+   * @param $paymentProcessor
+   * @param $paymentMode
+   * @param $start
+   * @param $end
+   */
   static
   function paypal($paymentProcessor, $paymentMode, $start, $end) {
     $url = "{$paymentProcessor['url_api']}nvp";
@@ -236,6 +242,12 @@ class CiviContributeProcessor {
     } while ($result['l_errorcode0'] == '11002');
   }
 
+  /**
+   * @param $paymentProcessor
+   * @param $paymentMode
+   * @param $start
+   * @param $end
+   */
   static
   function google($paymentProcessor, $paymentMode, $start, $end) {
     require_once "CRM/Contribute/BAO/Contribution/Utils.php";
@@ -381,7 +393,6 @@ class CiviContributeProcessor {
           CRM_Core_DAO::$_nullObject, FALSE, 'live', 'REQUEST'
         );
 
-        require_once 'CRM/Financial/BAO/PaymentProcessor.php';
         $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getPayment($ppID, $mode);
 
         CRM_Core_Error::debug_log_message("Start Date=$start,  End Date=$end, ppID=$ppID, mode=$mode <p>", TRUE);