jenkins-bot has submitted this change and it was merged.
Change subject: Switch to ct_id + sequenceNum order IDs
......................................................................
Switch to ct_id + sequenceNum order IDs
Need unique order IDs for each redirect now that we're queueing
pending messages before donor returns from iframe.
Bug: T127096
Change-Id: Icdfde48acb6a211975daa1f6780a9e8d742e832e
---
M adyen_gateway/adyen.adapter.php
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 9dbd61b..250b2fc 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -120,6 +120,7 @@
public function defineOrderIDMeta() {
$this->order_id_meta = array (
'alt_locations' => array ( 'request' =>
'merchantReference' ),
+ 'ct_id' => TRUE,
'generate' => TRUE,
);
}
@@ -222,6 +223,11 @@
* is never used at all.
*/
function do_transaction( $transaction ) {
+ // If this is not our first call, get a fresh order ID
+ // FIXME: This is repeated in three places. Maybe always
regenerate in incrementSequenceNumber?
+ if ( $this->session_getData( 'sequence' ) ) {
+ $this->regenerateOrderID();
+ }
$this->session_addDonorData();
$this->setCurrentTransaction( $transaction );
$this->transaction_response = new PaymentTransactionResponse();
@@ -267,6 +273,8 @@
break;
}
}
+ // Ensure next attempt gets a unique order ID
+ $this->incrementSequenceNumber();
return $this->transaction_response;
}
--
To view, visit https://gerrit.wikimedia.org/r/271017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdfde48acb6a211975daa1f6780a9e8d742e832e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
