Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/229005
Change subject: Merge branch 'master' into deployment ...................................................................... Merge branch 'master' into deployment ee71e13 Add Square gateway to GatewayReconciliation 9a0e4a4 Update SmashPig to add currency to AstroPay audit Change-Id: I07c4dfc6e05f2a497b02c3f578d6519fd5621ef5 --- D sites/all/modules/wmf_audit/tests/data/AstroPay/bt/wikimedia_report_2015-06-17.csv D sites/all/modules/wmf_audit/tests/data/AstroPay/donation/wikimedia_report_2015-06-16.csv D sites/all/modules/wmf_audit/tests/data/AstroPay/refund/wikimedia_report_2015-06-16.csv M vendor 4 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/05/229005/1 diff --git a/sites/all/modules/wmf_audit/tests/data/AstroPay/bt/wikimedia_report_2015-06-17.csv b/sites/all/modules/wmf_audit/tests/data/AstroPay/bt/wikimedia_report_2015-06-17.csv deleted file mode 100644 index b40ea2b..0000000 --- a/sites/all/modules/wmf_audit/tests/data/AstroPay/bt/wikimedia_report_2015-06-17.csv +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD (db417a Merge branch 'master' into deployment) -======= -Type;"Creation date";"Settlement date";Reference;Invoice;Country;"Payment Method";"Payment Method Type";"Net Amount (local)";"Amount (USD)";currency;Status;"User Mail";"Transaction Reference";"Transaction Invoice";Fee;IOF -Payment;"2015-06-17 01:59:30";"2015-06-17 02:00:59";5258777;2476135999.0;BR;B;"Bank Transfer";4.00;1.20;BRL;Cleared;[email protected];;;0.03;0.02 ->>>>>>> BRANCH (9a0e4a Update SmashPig to add currency to AstroPay audit) diff --git a/sites/all/modules/wmf_audit/tests/data/AstroPay/donation/wikimedia_report_2015-06-16.csv b/sites/all/modules/wmf_audit/tests/data/AstroPay/donation/wikimedia_report_2015-06-16.csv deleted file mode 100644 index 4b673b3..0000000 --- a/sites/all/modules/wmf_audit/tests/data/AstroPay/donation/wikimedia_report_2015-06-16.csv +++ /dev/null @@ -1,6 +0,0 @@ -<<<<<<< HEAD (db417a Merge branch 'master' into deployment) -======= -Type;"Creation date";"Settlement date";Reference;Invoice;Country;"Payment Method";"Payment Method Type";"Net Amount (local)";"Amount (USD)";currency;Status;"User Mail";"Transaction Reference";"Transaction Invoice";Fee;IOF -Payment;"2015-06-16 17:59:12";"2015-06-16 18:00:32";5258111;26683111.0;BR;MC;"Credit Card";5.00;1.50;BRL;Cleared;[email protected];;;0.03;0.02 -Payment;"2015-06-16 17:59:30";"2015-06-16 18:00:59";5258222;26683222.0;BR;MC;"Credit Card";5.00;1.50;BRL;Cleared;[email protected];;;0.03;0.02 ->>>>>>> BRANCH (9a0e4a Update SmashPig to add currency to AstroPay audit) diff --git a/sites/all/modules/wmf_audit/tests/data/AstroPay/refund/wikimedia_report_2015-06-16.csv b/sites/all/modules/wmf_audit/tests/data/AstroPay/refund/wikimedia_report_2015-06-16.csv deleted file mode 100644 index 5f233b5..0000000 --- a/sites/all/modules/wmf_audit/tests/data/AstroPay/refund/wikimedia_report_2015-06-16.csv +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD (db417a Merge branch 'master' into deployment) -======= -Type;"Creation date";"Settlement date";Reference;Invoice;Country;"Payment Method";"Payment Method Type";"Net Amount (local)";"Amount (USD)";currency;Status;"User Mail";"Transaction Reference";"Transaction Invoice";Fee;IOF -Refund;"2015-06-16 21:00:06";;33333;;BR;;;5.00;;BRL;Completed;[email protected];5138333;2476135333.0;; ->>>>>>> BRANCH (9a0e4a Update SmashPig to add currency to AstroPay audit) diff --git a/vendor b/vendor index 914b390..e745913 160000 --- a/vendor +++ b/vendor -Subproject commit 914b3901120140add1b9470c34e589392c39e624 +Subproject commit e745913cdae7abce987f656ea2aff09d6c59428e -- To view, visit https://gerrit.wikimedia.org/r/229005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07c4dfc6e05f2a497b02c3f578d6519fd5621ef5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
