Fix issues with retrieving supportsTestMode/supportsLiveMode for paym…

…ent processors
civicrm · Oct 7, 2019 · 5612bb0 · 5612bb0
1 parent ffadd26
commit 5612bb0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 43 deletions.
diff --git a/CRM/Contribute/Form/AbstractEditPayment.php b/CRM/Contribute/Form/AbstractEditPayment.php
@@ -385,19 +385,12 @@ public function assignProcessors() {
     }
     $this->_processors = [];
     foreach ($this->_paymentProcessors as $id => $processor) {
-      // @todo review this. The inclusion of this IF was to address test processors being incorrectly loaded.
-      // However the function $this->getValidProcessors() is expected to only return the processors relevant
-      // to the mode (using the actual id - ie. the id of the test processor for the test processor).
-      // for some reason there was a need to filter here per commit history - but this indicates a problem
-      // somewhere else.
-      if ($processor['is_test'] == ($this->_mode == 'test')) {
-        $this->_processors[$id] = $processor['name'];
-        if (!empty($processor['description'])) {
-          $this->_processors[$id] .= ' : ' . $processor['description'];
-        }
-        if ($processor['is_recur']) {
-          $this->_recurPaymentProcessors[$id] = $this->_processors[$id];
-        }
+      $this->_processors[$id] = $processor['name'];
+      if (!empty($processor['description'])) {
+        $this->_processors[$id] .= ' : ' . $processor['description'];
+      }
+      if ($processor['is_recur']) {
+        $this->_recurPaymentProcessors[$id] = $this->_processors[$id];
       }
     }
     // CRM-21002: pass the default payment processor ID whose credit card type icons should be populated first

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -792,10 +792,7 @@ public function getPaymentProcessorID() {
    * @throws \CRM_Core_Exception
    */
   protected function assignPaymentProcessor($isPayLaterEnabled) {
-    $this->_paymentProcessors = CRM_Financial_BAO_PaymentProcessor::getPaymentProcessors(
-      [ucfirst($this->_mode) . 'Mode'],
-      $this->_paymentProcessorIDs
-    );
+    $this->_paymentProcessors = CRM_Financial_BAO_PaymentProcessor::getPaymentProcessors([ucfirst($this->_mode) . 'Mode'], $this->_paymentProcessorIDs);
     if ($isPayLaterEnabled) {
       $this->_paymentProcessors[0] = CRM_Financial_BAO_PaymentProcessor::getPayment(0);
     }

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
@@ -334,7 +334,7 @@ protected function supportsMultipleConcurrentPayments() {
    * @return bool
    */
   protected function supportsLiveMode() {
-    return TRUE;
+    return empty($this->_paymentProcessor['is_test']) ? TRUE : FALSE;
   }
 
   /**
@@ -343,7 +343,7 @@ protected function supportsLiveMode() {
    * @return bool
    */
   protected function supportsTestMode() {
-    return TRUE;
+    return empty($this->_paymentProcessor['is_test']) ? FALSE : TRUE;
   }
 
   /**

diff --git a/CRM/Core/Payment/Dummy.php b/CRM/Core/Payment/Dummy.php
@@ -132,17 +132,6 @@ public function doDirectPayment(&$params) {
     return $params;
   }
 
-  /**
-   * Are back office payments supported.
-   *
-   * E.g paypal standard won't permit you to enter a credit card associated with someone else's login.
-   *
-   * @return bool
-   */
-  protected function supportsLiveMode() {
-    return TRUE;
-  }
-
   /**
    * Does this payment processor support refund?
    *

diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php
@@ -368,26 +368,26 @@ public static function getAllPaymentProcessors($mode = 'all', $reset = FALSE, $i
    *   available processors
    */
   public static function getPaymentProcessors($capabilities = [], $ids = FALSE) {
-    $testProcessors = in_array('TestMode', $capabilities) ? self::getAllPaymentProcessors('test') : [];
     if (is_array($ids)) {
+      $testProcessors = in_array('TestMode', $capabilities) ? self::getAllPaymentProcessors('test') : [];
       $processors = self::getAllPaymentProcessors('all', FALSE, FALSE);
-    }
-    else {
-      $processors = self::getAllPaymentProcessors('all');
-    }
 
-    if (in_array('TestMode', $capabilities) && is_array($ids)) {
-      $possibleLiveIDs = array_diff($ids, array_keys($testProcessors));
-      foreach ($possibleLiveIDs as $possibleLiveID) {
-        if (isset($processors[$possibleLiveID]) && ($liveProcessorName = $processors[$possibleLiveID]['name']) != FALSE) {
-          foreach ($testProcessors as $index => $testProcessor) {
-            if ($testProcessor['name'] == $liveProcessorName) {
-              $ids[] = $testProcessor['id'];
+      if (in_array('TestMode', $capabilities)) {
+        $possibleLiveIDs = array_diff($ids, array_keys($testProcessors));
+        foreach ($possibleLiveIDs as $possibleLiveID) {
+          if (isset($processors[$possibleLiveID]) && ($liveProcessorName = $processors[$possibleLiveID]['name']) != FALSE) {
+            foreach ($testProcessors as $index => $testProcessor) {
+              if ($testProcessor['name'] == $liveProcessorName) {
+                $ids[] = $testProcessor['id'];
+              }
             }
           }
         }
+        $processors = $testProcessors;
       }
-      $processors = $testProcessors;
+    }
+    else {
+      $processors = self::getAllPaymentProcessors('all');
     }
 
     foreach ($processors as $index => $processor) {

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -809,6 +809,10 @@ public function processorCreate($params = array()) {
    */
   public function dummyProcessorCreate($processorParams = array()) {
     $paymentProcessorID = $this->processorCreate($processorParams);
+    // For the tests we don't need a live processor, but as core ALWAYS creates a processor in live mode and one in test mode we do need to create both
+    //   Otherwise we are testing a scenario that only exists in tests (and some tests fail because the live processor has not been defined).
+    $processorParams['is_test'] = FALSE;
+    $this->processorCreate($processorParams);
     return System::singleton()->getById($paymentProcessorID);
   }