[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Fix PayPal EC recurring profile created messages

2017-07-25 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367624 )

Change subject: Fix PayPal EC recurring profile created messages
..


Fix PayPal EC recurring profile created messages

We should send currency and amount to Civi.

Bug: T171546
Change-Id: I36dd1f05cbd66eac292b351b0809419c46e9dc09
---
M 
PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
M config/paypal/main.yaml
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Mepps: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
index ce73c80..0c7ad8e 100644
--- 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
+++ 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
@@ -15,5 +15,7 @@
   "start_date": 1492533928,
   "date": 1492533928,
   "gateway": "paypal_ec",
-  "recurring": "1"
+  "recurring": "1",
+  "gross": "140",
+  "currency": "JPY"
 }
diff --git a/config/paypal/main.yaml b/config/paypal/main.yaml
index cbd7aaf..8ee159f 100644
--- a/config/paypal/main.yaml
+++ b/config/paypal/main.yaml
@@ -28,6 +28,7 @@
 # FIXME This is only true for refund messages.  Where to represent?
 #txn_id: gateway_refund_id
 mc_currency: currency
+currency_code: currency
 # FIXME rename refund_type
 reason_code: type
 #test_ipn:  # signals test mode
@@ -46,6 +47,9 @@
 # FIXME this too
 address_name: supplemental_address_1
 gateway: gateway
+# NOTE: order matters. When multiple PayPal fields map to the
+# same SmashPig field, PayPal fields listed later take precedence.
+amount_per_cycle: gross
 mc_gross: gross
 mc_amount3: gross
 amount3: gross

-- 
To view, visit https://gerrit.wikimedia.org/r/367624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36dd1f05cbd66eac292b351b0809419c46e9dc09
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Fix PayPal EC recurring profile created messages

2017-07-24 Thread Ejegg (Code Review)
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367624 )

Change subject: Fix PayPal EC recurring profile created messages
..

Fix PayPal EC recurring profile created messages

We should send currency and amount to Civi

Bug: T171546
Change-Id: I36dd1f05cbd66eac292b351b0809419c46e9dc09
---
M 
PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
M config/paypal/main.yaml
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/24/367624/1

diff --git 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
index ce73c80..0c7ad8e 100644
--- 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
+++ 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_profile_created_transformed.json
@@ -15,5 +15,7 @@
   "start_date": 1492533928,
   "date": 1492533928,
   "gateway": "paypal_ec",
-  "recurring": "1"
+  "recurring": "1",
+  "gross": "140",
+  "currency": "JPY"
 }
diff --git a/config/paypal/main.yaml b/config/paypal/main.yaml
index cbd7aaf..005c889 100644
--- a/config/paypal/main.yaml
+++ b/config/paypal/main.yaml
@@ -28,6 +28,7 @@
 # FIXME This is only true for refund messages.  Where to represent?
 #txn_id: gateway_refund_id
 mc_currency: currency
+currency_code: currency
 # FIXME rename refund_type
 reason_code: type
 #test_ipn:  # signals test mode
@@ -46,6 +47,8 @@
 # FIXME this too
 address_name: supplemental_address_1
 gateway: gateway
+# NOTE: order matters, later ones override earlier ones
+amount_per_cycle: gross
 mc_gross: gross
 mc_amount3: gross
 amount3: gross

-- 
To view, visit https://gerrit.wikimedia.org/r/367624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36dd1f05cbd66eac292b351b0809419c46e9dc09
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits