Improve error handling, show more if permission to admin payment processors is held

Author: eileenmcnaughton

CRM/Core/Payment/OmnipayMultiProcessor.php

@@ -175,7 +175,7 @@ public function doPayment(&$params, $component = 'contribute') {
       }
       else {
         //@todo - is $response->getCode supported by some / many processors?
-        return $this->handleError('alert', 'failed processor transaction ' . $this->_paymentProcessor['payment_processor_type'], (array) $response, 9001, $response->getMessage());
+        return $this->handleError('alert', 'failed processor transaction ' . $this->_paymentProcessor['payment_processor_type'], array($response->getCode() => $response->getMessage()));
       }
     }
     catch (\Exception $e) {

CRM/Core/Payment/PaymentExtended.php

@@ -54,6 +54,11 @@ abstract class CRM_Core_Payment_PaymentExtended extends CRM_Core_Payment {
    */
   protected $payment_type_label;
 
+  /**
+   * @var \Omnipay\Common\AbstractGateway
+   */
+  protected $gateway;
+
   /**
    * Class Constructor.
    *
@@ -299,6 +304,10 @@ protected function handleError($level, $message, $context, $errorCode = 9001, $u
     Civi::log()->log($level, $message, (array) $context);
     $log = new CRM_Utils_SystemLogger();
     $log->log($level, $message, (array) $context);
+
+    if (CRM_Core_Permission::check('administer payment processors')) {
+      $userMessage = implode(',', $context);
+    }
     throw new \Civi\Payment\Exception\PaymentProcessorException($userMessage);
   }