jenkins-bot has submitted this change and it was merged.
Change subject: Minimalist iDEAL order id refresh fix
......................................................................
Minimalist iDEAL order id refresh fix
Adds the MAX_NR_OF_ATTEMPTS_REACHED error code to the cases
that set the retryvar, logs approprate messages.
Bug: T131983
Change-Id: Iac924aea412c1e9a14df4289c8f1f503e170f87e
---
M globalcollect_gateway/globalcollect.adapter.php
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index c4d6ff4..af76524 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1352,6 +1352,7 @@
foreach ( $errors as $errCode => $errObj ) {
$errMsg = $errObj['message'];
$messageFromProcessor = $errObj['debugInfo'];
+ $retryOrderId = false;
switch ( $errCode ) {
case 400120: // INSERTATTEMPT PAYMENT FOR ORDER
ALREADY FINAL FOR COMBINATION.
$transaction =
$this->getCurrentTransaction();
@@ -1364,12 +1365,16 @@
$retErrMsg = $errMsg;
break;
}
- // Fall through.
+ $this->logger->error( 'InsertAttempt on
a finalized order! Starting again.' );
+ $retryOrderId = true;
+ break;
+ case 400490: //
INSERTATTEMPT_MAX_NR_OF_ATTEMPTS_REACHED
+ $this->logger->error( 'InsertAttempt -
max attempts reached! Starting again.' );
+ $retryOrderId = true;
+ break;
case 300620: // Oh no! We've already used this
order # somewhere else! Restart!
$this->logger->error( 'Order ID
collision! Starting again.' );
- $retryVars[] = 'order_id';
- $retErrCode = $errCode;
- $retErrMsg = $errMsg;
+ $retryOrderId = true;
break;
case 430260: // wow: If we were a point of
sale, we'd be calling security.
case 430349: //
TRANSACTION_CANNOT_BE_COMPLETED_VIOLATION_OF_LAW (EXTERMINATE!)
@@ -1441,6 +1446,11 @@
$this->logger->error( __FUNCTION__ . "
Error $errCode : $errMsg" );
break;
}
+ if ( $retryOrderId ) {
+ $retryVars[] = 'order_id';
+ $retErrCode = $errCode;
+ $retErrMsg = $errMsg;
+ }
}
if ( $retErrCode ) {
throw new ResponseProcessingException(
--
To view, visit https://gerrit.wikimedia.org/r/282297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac924aea412c1e9a14df4289c8f1f503e170f87e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
