jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403230 )
Change subject: Adyen test IPN messages: use right account ...................................................................... Adyen test IPN messages: use right account WikimediaCOM isn't the thing anymore, and we have that in the db. What we DON'T have in the pending db is the actual PSP reference. Right now, the only way to test actual interaction with the sandbox server is to look at the donation in https://ca-test.adyen.com/ca/ca/payments/showList.shtml then edit the generated auth_success.x.xml and put in the correct originalReference Change-Id: If2c25c760e8862d1d6c696a6e5593cb736a47d33 --- M Maintenance/CreateIpnMessagesFromPendingDb.php M Tests/IPNTemplates/adyen/auth_success.xml M Tests/IPNTemplates/adyen/capture_success.xml 3 files changed, 5 insertions(+), 2 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/Maintenance/CreateIpnMessagesFromPendingDb.php b/Maintenance/CreateIpnMessagesFromPendingDb.php index 5fc6aff..dde83d5 100644 --- a/Maintenance/CreateIpnMessagesFromPendingDb.php +++ b/Maintenance/CreateIpnMessagesFromPendingDb.php @@ -84,6 +84,9 @@ $replacements['[[ASTROPAY_SIGNATURE_SUCCESS]]'] = $this->getAstroPaySignature( $pendingMessage, '9' ); $replacements['[[ASTROPAY_SIGNATURE_FAILURE]]'] = $this->getAstroPaySignature( $pendingMessage, '8' ); } + if ( isset( $pendingMessage['gateway_account'] ) ) { + $replacements['[[ACCOUNT_CODE]]'] = $pendingMessage['gateway_account']; + } foreach ( $templates as $template ) { $fullPath = $this->templateDir . $template; if ( is_dir( $fullPath ) ) { diff --git a/Tests/IPNTemplates/adyen/auth_success.xml b/Tests/IPNTemplates/adyen/auth_success.xml index f053f3c..c004508 100644 --- a/Tests/IPNTemplates/adyen/auth_success.xml +++ b/Tests/IPNTemplates/adyen/auth_success.xml @@ -22,7 +22,7 @@ </amount> <eventCode>AUTHORISATION</eventCode> <eventDate>2016-01-25T17:07:36.862+01:00</eventDate> - <merchantAccountCode>WikimediaCOM</merchantAccountCode> + <merchantAccountCode>[[ACCOUNT_CODE]]</merchantAccountCode> <merchantReference>[[ORDER_ID]]</merchantReference> <operations> <string>CANCEL</string> diff --git a/Tests/IPNTemplates/adyen/capture_success.xml b/Tests/IPNTemplates/adyen/capture_success.xml index 41cf808..fb22ca2 100644 --- a/Tests/IPNTemplates/adyen/capture_success.xml +++ b/Tests/IPNTemplates/adyen/capture_success.xml @@ -13,7 +13,7 @@ </amount> <eventCode>CAPTURE</eventCode> <eventDate>2015-12-11T20:30:03+01:00</eventDate> - <merchantAccountCode>WikimediaCOM</merchantAccountCode> + <merchantAccountCode>[[ACCOUNT_CODE]]</merchantAccountCode> <merchantReference>[[ORDER_ID]]</merchantReference> <operations xsi:nil="true"/> <originalReference>[[PROCESSOR_REF_1]]</originalReference> -- To view, visit https://gerrit.wikimedia.org/r/403230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2c25c760e8862d1d6c696a6e5593cb736a47d33 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/SmashPig Gerrit-Branch: master Gerrit-Owner: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Mepps <me...@wikimedia.org> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
