jenkins-bot has submitted this change and it was merged.
Change subject: Killall original_
......................................................................
Killall original_
Change-Id: I14c2bc80a58751be5a341f885917682b563764fa
---
M activemq_stomp/activemq_stomp.php
1 file changed, 2 insertions(+), 9 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/activemq_stomp/activemq_stomp.php
b/activemq_stomp/activemq_stomp.php
index a1a02e3..dce671a 100644
--- a/activemq_stomp/activemq_stomp.php
+++ b/activemq_stomp/activemq_stomp.php
@@ -175,7 +175,6 @@
* PAssed both ISO and country code, no need to look up
* 'gateway' = globalcollect, e.g.
* 'date' is sent as $date("r") so it can be translated with strtotime like
Paypal transactions (correct?)
- * 'gross', 'original_gross', and 'net' are all set to amount, no fees are
included in these transactions
* Processor txn ID sent in the transaction response is assigned to
'gateway_txn_id' (PNREF)
* Order ID (generated with transaction) is assigned to
'contribution_tracking_id'?
* Response from processor is assigned to 'response'
@@ -203,11 +202,8 @@
'payment_submethod' => $transaction['payment_submethod'],
'response' => $transaction['response'],
'currency' => $transaction['currency_code'],
- 'original_currency' => $transaction['currency_code'],
- 'original_gross' => $transaction['amount'],
'fee' => '0',
'gross' => $transaction['amount'],
- 'net' => $transaction['amount'],
'user_ip' => $transaction['user_ip'],
//the following int casting fixes an issue that is more in
Drupal/CiviCRM than here.
//The code there should also be fixed.
@@ -256,11 +252,8 @@
'street_address' => 'street',
'state_province' => 'state',
'postal_code' => 'zip',
-// 'currency' => 'currency_code',
- 'original_currency' => 'currency_code',
- 'original_gross' => 'amount',
-// 'gross' => 'amount',
-// 'net' => 'amount',
+ 'currency' => 'currency_code',
+ 'gross' => 'amount',
);
foreach ( $rekey as $stomp => $di ){
--
To view, visit https://gerrit.wikimedia.org/r/164393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14c2bc80a58751be5a341f885917682b563764fa
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
