[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: PayPal fixed the double space in their audit header

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

Change subject: PayPal fixed the double space in their audit header
..


PayPal fixed the double space in their audit header

Change-Id: I4cf9a3c3ba169ee8b801228547b2ba3ee2b2715f
TODO: trim, normalize spaces, maybe even ignore case
---
M audit/paypal/TrrFile.py
M audit/paypal/tests/data/express_checkout_donation.csv
M audit/paypal/tests/data/express_checkout_recurring_donation.csv
M audit/paypal/tests/data/express_checkout_recurring_refund.csv
M audit/paypal/tests/data/express_checkout_refund.csv
M audit/paypal/tests/test_trr_file.py
6 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/audit/paypal/TrrFile.py b/audit/paypal/TrrFile.py
index f57def0..2b1e851 100644
--- a/audit/paypal/TrrFile.py
+++ b/audit/paypal/TrrFile.py
@@ -27,7 +27,7 @@
 "Transaction Event Code",
 "Transaction Initiation Date",
 "Transaction Completion Date",
-"Transaction  Debit or Credit",
+"Transaction Debit or Credit",
 "Gross Transaction Amount",
 "Gross Transaction Currency",
 "Fee Debit or Credit",
@@ -155,7 +155,7 @@
 out['subscr_id'] = row['PayPal Reference ID']
 if not out['subscr_id']:
 raise Exception('Missing field subscr_id')
-elif row['Transaction  Debit or Credit'] == 'DR':
+elif row['Transaction Debit or Credit'] == 'DR':
 # sic: double-space is coming from the upstream
 log.info("-Debit\t{id}\t{date}\tPayment 
to".format(id=out['gateway_txn_id'], date=out['date']))
 # This payment is from us!  Do not send to the CRM.
diff --git a/audit/paypal/tests/data/express_checkout_donation.csv 
b/audit/paypal/tests/data/express_checkout_donation.csv
index 1c9add6..18e603f 100644
--- a/audit/paypal/tests/data/express_checkout_donation.csv
+++ b/audit/paypal/tests/data/express_checkout_donation.csv
@@ -1,2 +1,2 @@
-"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction  Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
+"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
 "SB","1V551844CE5526421","46239229.0","","","T0006",2017/03/02 09:59:55 
-0800,2017/03/02 09:59:55 
-0800,"CR",15000,"JPY","DR",4300,"JPY","S",,0,0,"Donation to the Wikimedia 
Foundation","","do...@generous.net","N","Donation to the Wikimedia 
Foundation","","","","","","","",,"","","","","","","","46239229","321 Notta 
Boulevard","","Whoville","OR","97211","US","RTWSDJI4S8DWK","Cindy 
Lou","Who","Cindy Lou Who","","Express Checkout","Cindy Lou, Who","01","02",""
diff --git a/audit/paypal/tests/data/express_checkout_recurring_donation.csv

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: PayPal fixed the double space in their audit header

2017-06-19 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359956 )

Change subject: PayPal fixed the double space in their audit header
..

PayPal fixed the double space in their audit header

Change-Id: I4cf9a3c3ba169ee8b801228547b2ba3ee2b2715f
TODO: trim, normalize spaces, maybe even ignore case
---
M audit/paypal/TrrFile.py
M audit/paypal/tests/data/express_checkout_donation.csv
M audit/paypal/tests/data/express_checkout_recurring_donation.csv
M audit/paypal/tests/data/express_checkout_recurring_refund.csv
M audit/paypal/tests/data/express_checkout_refund.csv
M audit/paypal/tests/test_trr_file.py
6 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/56/359956/1

diff --git a/audit/paypal/TrrFile.py b/audit/paypal/TrrFile.py
index f57def0..2b1e851 100644
--- a/audit/paypal/TrrFile.py
+++ b/audit/paypal/TrrFile.py
@@ -27,7 +27,7 @@
 "Transaction Event Code",
 "Transaction Initiation Date",
 "Transaction Completion Date",
-"Transaction  Debit or Credit",
+"Transaction Debit or Credit",
 "Gross Transaction Amount",
 "Gross Transaction Currency",
 "Fee Debit or Credit",
@@ -155,7 +155,7 @@
 out['subscr_id'] = row['PayPal Reference ID']
 if not out['subscr_id']:
 raise Exception('Missing field subscr_id')
-elif row['Transaction  Debit or Credit'] == 'DR':
+elif row['Transaction Debit or Credit'] == 'DR':
 # sic: double-space is coming from the upstream
 log.info("-Debit\t{id}\t{date}\tPayment 
to".format(id=out['gateway_txn_id'], date=out['date']))
 # This payment is from us!  Do not send to the CRM.
diff --git a/audit/paypal/tests/data/express_checkout_donation.csv 
b/audit/paypal/tests/data/express_checkout_donation.csv
index 1c9add6..18e603f 100644
--- a/audit/paypal/tests/data/express_checkout_donation.csv
+++ b/audit/paypal/tests/data/express_checkout_donation.csv
@@ -1,2 +1,2 @@
-"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction  Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
+"CH","Transaction ID","Invoice ID","PayPal Reference ID","PayPal Reference ID 
Type","Transaction Event Code","Transaction Initiation Date","Transaction 
Completion Date","Transaction Debit or Credit","Gross Transaction 
Amount","Gross Transaction Currency","Fee Debit or Credit","Fee Amount","Fee 
Currency","Transactional Status","Insurance Amount","Sales Tax 
Amount","Shipping Amount","Transaction Subject","Transaction Note","Payer's 
Account ID","Payer Address Status","Item Name","Item ID","Option 1 
Name","Option 1 Value","Option 2 Name","Option 2 Value","Auction Site","Auction 
Buyer ID","Auction Closing Date","Shipping Address Line1","Shipping Address 
Line2","Shipping Address City","Shipping Address State","Shipping Address 
Zip","Shipping Address Country","Shipping Method","Custom Field","Billing 
Address Line1","Billing Address Line2","Billing Address City","Billing Address 
State","Billing Address Zip","Billing Address Country","Consumer ID","First 
Name","Last Name","Consumer Business Name","Card Type","Payment 
Source","Shipping Name","Authorization Review Status","Protection 
Eligibility","Payment Tracking ID"
 "SB","1V551844CE5526421","46239229.0","","","T0006",2017/03/02 09:59:55 
-0800,2017/03/02 09:59:55 
-0800,"CR",15000,"JPY","DR",4300,"JPY","S",,0,0,"Donation to the Wikimedia 
Foundation","","do...@generous.net","N","Donation to the Wikimedia 
Foundation","","","","","","","",,"","","","","","","","46239229","321 Notta 
Boulevard","","Whoville","OR","97211","US","RTWSDJI4S8DWK","Cindy 
Lou","Who","Cindy Lou Who","","Express Checkout","Cindy Lou, Who","01","02",""
diff --git