From c80422d9fb76547f49dccca20fdf3f99b2aeb287 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 17 Aug 2020 12:34:53 +1200 Subject: [PATCH] Processors - remove gross_amount param from processors The gross_amount param is returned by a bunch of processors but is not used so this removes it. The core processors are often used as a starting point for extensions - we can see for example this parameter is present in IATS so removing it helps clarify it as unnecessary & unused --- CRM/Core/Payment/AuthorizeNet.php | 1 - CRM/Core/Payment/Dummy.php | 1 - CRM/Core/Payment/PayJunction.php | 1 - CRM/Core/Payment/PayPalImpl.php | 1 - CRM/Core/Payment/Realex.php | 1 - CRM/Core/Payment/eWAY.php | 1 - 6 files changed, 6 deletions(-) diff --git a/CRM/Core/Payment/AuthorizeNet.php b/CRM/Core/Payment/AuthorizeNet.php index 5a9fcbc992..0cbbc2b939 100644 --- a/CRM/Core/Payment/AuthorizeNet.php +++ b/CRM/Core/Payment/AuthorizeNet.php @@ -193,7 +193,6 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { default: // Success $params['trxn_id'] = !empty($response_fields[6]) ? $response_fields[6] : $this->getTestTrxnID(); - $params['gross_amount'] = $response_fields[9]; break; } diff --git a/CRM/Core/Payment/Dummy.php b/CRM/Core/Payment/Dummy.php index 4757fb296c..7961d56e94 100644 --- a/CRM/Core/Payment/Dummy.php +++ b/CRM/Core/Payment/Dummy.php @@ -97,7 +97,6 @@ class CRM_Core_Payment_Dummy extends CRM_Core_Payment { $params['trxn_id'] = $this->getTrxnID();; - $params['gross_amount'] = $propertyBag->getAmount(); // Add a fee_amount so we can make sure fees are handled properly in underlying classes. $params['fee_amount'] = 1.50; $params['description'] = $this->getPaymentDescription($params); diff --git a/CRM/Core/Payment/PayJunction.php b/CRM/Core/Payment/PayJunction.php index 4fc8ec9005..ce1b33442c 100644 --- a/CRM/Core/Payment/PayJunction.php +++ b/CRM/Core/Payment/PayJunction.php @@ -151,7 +151,6 @@ class CRM_Core_Payment_PayJunction extends CRM_Core_Payment { // Success $params['trxn_result_code'] = $pjpgResponse['dc_response_code']; $params['trxn_id'] = $pjpgResponse['dc_transaction_id']; - $params['gross_amount'] = $params['amount']; return $params; } diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index 79c2ecd9de..be3f794b11 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -339,7 +339,6 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { /* Success */ $params['trxn_id'] = $result['transactionid']; - $params['gross_amount'] = $result['amt']; $params['fee_amount'] = $result['feeamt']; $params['net_amount'] = $result['settleamt'] ?? NULL; if ($params['net_amount'] == 0 && $params['fee_amount'] != 0) { diff --git a/CRM/Core/Payment/Realex.php b/CRM/Core/Payment/Realex.php index 6fa22c9ccd..03ad040db4 100644 --- a/CRM/Core/Payment/Realex.php +++ b/CRM/Core/Payment/Realex.php @@ -175,7 +175,6 @@ class CRM_Core_Payment_Realex extends CRM_Core_Payment { $params['trxn_id'] = $response['PASREF']; $params['trxn_result_code'] = serialize($extras); $params['currencyID'] = $this->_getParam('currency'); - $params['gross_amount'] = $this->_getParam('amount'); $params['fee_amount'] = 0; return $params; diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index 9c37727053..e8ec19da0d 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -340,7 +340,6 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { $beaglestatus = ': ' . $beaglestatus; } $params['trxn_result_code'] = $eWAYResponse->Status() . $beaglestatus; - $params['gross_amount'] = $eWAYResponse->Amount(); $params['trxn_id'] = $eWAYResponse->TransactionNumber(); return $params; -- 2.25.1