jenkins-bot has submitted this change and it was merged.
Change subject: Disallow setting contribution tracking ID from request
......................................................................
Disallow setting contribution tracking ID from request
Should be OK since we don't generate that on donatewiki any more.
It will be generated fresh whenever it's not in session.
Bug: T137155
Change-Id: I92c90f20069b1633d21032be30e6770a65d24a14
---
M adyen_gateway/forms/js/adyen.js
M gateway_common/DonationData.php
M gateway_common/donation.api.php
M gateway_common/i18n/interface/en.json
M gateway_common/i18n/interface/qqq.json
M gateway_forms/RapidHtml.php
M gateway_forms/mustache/index.html.mustache
M globalcollect_gateway/forms/html/bt/bt.html
M globalcollect_gateway/forms/html/cash/boletos.html
M globalcollect_gateway/forms/html/cc/cc-a.html
M globalcollect_gateway/forms/html/cc/cc-jvma.html
M globalcollect_gateway/forms/html/cc/cc-vjma.html
M globalcollect_gateway/forms/html/cc/cc-vm.html
M globalcollect_gateway/forms/html/cc/cc-vma.html
M globalcollect_gateway/forms/html/cc/cc-vmad.html
M globalcollect_gateway/forms/html/cc/cc-vmaj.html
M globalcollect_gateway/forms/html/cc/cc-vmd.html
M globalcollect_gateway/forms/html/cc/cc-vmj.html
M globalcollect_gateway/forms/html/cc/cc.html
M globalcollect_gateway/forms/html/dd/dd-recurring.html
M globalcollect_gateway/forms/html/dd/dd.html
M globalcollect_gateway/forms/html/ew/ew-alipay.html
M globalcollect_gateway/forms/html/ew/ew-webmoney.html
M globalcollect_gateway/forms/html/ew/ew-yandex.html
M globalcollect_gateway/forms/html/obt/obt-bpay.html
M globalcollect_gateway/forms/html/rcc/rcc-vm.html
M globalcollect_gateway/forms/html/rcc/rcc-vma.html
M globalcollect_gateway/forms/html/rcc/rcc-vmad.html
M globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
M globalcollect_gateway/forms/html/rcc/rcc-vmd.html
M globalcollect_gateway/forms/html/rcc/rcc-vmj.html
M globalcollect_gateway/forms/html/rcc/rcc.html
M globalcollect_gateway/forms/html/rtbt/rtbt-enets.html
M globalcollect_gateway/forms/html/rtbt/rtbt-eps.html
M globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
M globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
M globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html
M globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html
M globalcollect_gateway/forms/html/webitects2nd-AU.html
M globalcollect_gateway/forms/html/webitects2nd-US.html
M globalcollect_gateway/forms/html/webitects2nd-amex.html
M globalcollect_gateway/forms/html/webitects2nd.html
M globalcollect_gateway/forms/html/webitects2nd_green-US.html
M globalcollect_gateway/forms/html/webitects_2_3step-CA.html
M globalcollect_gateway/forms/html/webitects_2_3step.html
M globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
M globalcollect_gateway/forms/js/gc.js
M globalcollect_gateway/forms/js/webitects.js
M tests/Adapter/GatewayAdapterTest.php
M worldpay_gateway/forms/html/worldpay-dd-test.html
M worldpay_gateway/forms/html/worldpay-test.html
M worldpay_gateway/forms/html/worldpay.html
M worldpay_gateway/forms/js/worldpay.js
M worldpay_gateway/i18n/en.json
M worldpay_gateway/i18n/qqq.json
M worldpay_gateway/worldpay.api.php
56 files changed, 6 insertions(+), 60 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/adyen_gateway/forms/js/adyen.js b/adyen_gateway/forms/js/adyen.js
index d223505..9679547 100644
--- a/adyen_gateway/forms/js/adyen.js
+++ b/adyen_gateway/forms/js/adyen.js
@@ -25,7 +25,6 @@
payment_method: 'cc',
language: $( '#language' ).val(),
payment_submethod: $(
'input[name="payment_submethod"]:checked' ).val().toLowerCase(),
- contribution_tracking_id: $(
'#contribution_tracking_id' ).val(),
utm_source: $( '#utm_source' ).val(),
utm_campaign: $( '#utm_campaign' ).val(),
utm_medium: $( '#utm_medium' ).val(),
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 34f246d..32ad120 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -71,7 +71,6 @@
'language',
'uselang',
'wmf_token',
- 'contribution_tracking_id',
'data_hash',
'action',
'gateway',
@@ -188,7 +187,7 @@
return;
}
//fields that should always overwrite with their original values
- $overwrite = array( 'referrer' );
+ $overwrite = array( 'referrer', 'contribution_tracking_id' );
foreach ( $donorData as $key => $val ) {
if ( !$this->isSomething( $key ) ) {
$this->setVal( $key, $val );
diff --git a/gateway_common/donation.api.php b/gateway_common/donation.api.php
index add7494..834323b 100644
--- a/gateway_common/donation.api.php
+++ b/gateway_common/donation.api.php
@@ -116,7 +116,6 @@
'payment_submethod' => $this->defineParam( false ),
'language' => $this->defineParam( false ),
'order_id' => $this->defineParam( false ),
- 'contribution_tracking_id' => $this->defineParam( false
),
'wmf_token' => $this->defineParam( false ),
'utm_source' => $this->defineParam( false ),
'utm_campaign' => $this->defineParam( false ),
@@ -160,7 +159,6 @@
'payment_submethod' => 'Payment submethod to use',
'language' => 'Language code',
'order_id' => 'Order ID (if a donation has already been
started)',
- 'contribution_tracking_id' => 'ID for contribution
tracking table',
'wmf_token' => 'Mediawiki edit token',
'utm_source' => 'Tracking variable',
'utm_campaign' => 'Tracking variable',
diff --git a/gateway_common/i18n/interface/en.json
b/gateway_common/i18n/interface/en.json
index 0e6f8dd..b2eb231 100644
--- a/gateway_common/i18n/interface/en.json
+++ b/gateway_common/i18n/interface/en.json
@@ -438,7 +438,6 @@
"apihelp-donate-param-payment_submethod": "Payment submethod to use.",
"apihelp-donate-param-language": "Language code.",
"apihelp-donate-param-order_id": "Order ID (if a donation has already
been started).",
- "apihelp-donate-param-contribution_tracking_id": "ID for contribution
tracking table.",
"apihelp-donate-param-wmf_token": "Edit token.",
"apihelp-donate-param-utm_source": "Tracking variable.",
"apihelp-donate-param-utm_campaign": "Tracking variable.",
diff --git a/gateway_common/i18n/interface/qqq.json
b/gateway_common/i18n/interface/qqq.json
index af18aa5..8434da3 100644
--- a/gateway_common/i18n/interface/qqq.json
+++ b/gateway_common/i18n/interface/qqq.json
@@ -463,7 +463,6 @@
"apihelp-donate-param-payment_submethod":
"{{doc-apihelp-param|donate|payment_submethod}}",
"apihelp-donate-param-language":
"{{doc-apihelp-param|donate|language}}\n{{Identical|Language code}}",
"apihelp-donate-param-order_id":
"{{doc-apihelp-param|donate|order_id}}",
- "apihelp-donate-param-contribution_tracking_id":
"{{doc-apihelp-param|donate|contribution_tracking_id}}",
"apihelp-donate-param-wmf_token":
"{{doc-apihelp-param|donate|wmf_token}}",
"apihelp-donate-param-utm_source":
"{{doc-apihelp-param|donate|utm_source}}",
"apihelp-donate-param-utm_campaign":
"{{doc-apihelp-param|donate|utm_campaign}}",
diff --git a/gateway_forms/RapidHtml.php b/gateway_forms/RapidHtml.php
index abf2e1c..fed21b4 100644
--- a/gateway_forms/RapidHtml.php
+++ b/gateway_forms/RapidHtml.php
@@ -59,7 +59,6 @@
'@email-opt', // => WebRequest->getText( 'email-opt' ),
'@test_string', // => WebRequest->getText( 'process' ), // for
showing payflow string during testing
'@wmf_token', // => $wmf_token,
- '@contribution_tracking_id', // => WebRequest->getText(
'contribution_tracking_id' ),
'@data_hash', // => WebRequest->getText( 'data_hash' ),
'@action', // => WebRequest->getText( 'action' ),
'@gateway', // => 'globalcollect', // this may need to become
dynamic in the future
diff --git a/gateway_forms/mustache/index.html.mustache
b/gateway_forms/mustache/index.html.mustache
index 8cd35d0..60063e1 100644
--- a/gateway_forms/mustache/index.html.mustache
+++ b/gateway_forms/mustache/index.html.mustache
@@ -43,7 +43,6 @@
<input type="hidden" value="{{ referrer }}"
name="referrer" id="referrer"/>
<input type="hidden" value="{{ wmf_token }}"
name="wmf_token" id="wmf_token"/>
<input type="hidden" value="{{ order_id }}"
name="order_id" id="order_id"/>
- <input type="hidden" value="{{
contribution_tracking_id }}" name="contribution_tracking_id"
id="contribution_tracking_id"/>
<input type="hidden" value="{{ data_hash }}"
name="data_hash" id="data_hash"/>
<input type="hidden" value="{{ gateway }}"
name="gateway" id="gateway"/>
<input type="hidden" value="{{ recurring }}"
name="recurring" id="recurring"/>
diff --git a/globalcollect_gateway/forms/html/bt/bt.html
b/globalcollect_gateway/forms/html/bt/bt.html
index fe30b1c..f5e977c 100644
--- a/globalcollect_gateway/forms/html/bt/bt.html
+++ b/globalcollect_gateway/forms/html/bt/bt.html
@@ -69,7 +69,6 @@
<input type="hidden"
value="@referrer" name="referrer"/>
<input type="hidden"
value="@wmf_token" name="wmf_token"/>
<input type="hidden"
value="@order_id" name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden"
value="@data_hash" name="data_hash"/>
<input type="hidden"
value="@owa_session" name="owa_session"/>
<input type="hidden"
value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cash/boletos.html
b/globalcollect_gateway/forms/html/cash/boletos.html
index ffbef69..37502c9 100644
--- a/globalcollect_gateway/forms/html/cash/boletos.html
+++ b/globalcollect_gateway/forms/html/cash/boletos.html
@@ -61,7 +61,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden"
value="@owa_session" name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-a.html
b/globalcollect_gateway/forms/html/cc/cc-a.html
index 0dda714..d998769 100644
--- a/globalcollect_gateway/forms/html/cc/cc-a.html
+++ b/globalcollect_gateway/forms/html/cc/cc-a.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-jvma.html
b/globalcollect_gateway/forms/html/cc/cc-jvma.html
index 1ebad90..168b4f8 100644
--- a/globalcollect_gateway/forms/html/cc/cc-jvma.html
+++ b/globalcollect_gateway/forms/html/cc/cc-jvma.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vjma.html
b/globalcollect_gateway/forms/html/cc/cc-vjma.html
index 2599da6..b3fe834 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vjma.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vjma.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vm.html
b/globalcollect_gateway/forms/html/cc/cc-vm.html
index 03a45ec..72b5231 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vm.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vm.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vma.html
b/globalcollect_gateway/forms/html/cc/cc-vma.html
index 64d428f..d68794a 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vma.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vma.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmad.html
b/globalcollect_gateway/forms/html/cc/cc-vmad.html
index b7b8bf1..73b0a4f 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmad.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmad.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmaj.html
b/globalcollect_gateway/forms/html/cc/cc-vmaj.html
index 31ee12e..e4dd6d2 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmaj.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmaj.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmd.html
b/globalcollect_gateway/forms/html/cc/cc-vmd.html
index 28b42fb..4f51eb4 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmd.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmd.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmj.html
b/globalcollect_gateway/forms/html/cc/cc-vmj.html
index 36434ca..b95101e 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmj.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmj.html
@@ -78,7 +78,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/cc/cc.html
b/globalcollect_gateway/forms/html/cc/cc.html
index b011e07..22d5a26 100644
--- a/globalcollect_gateway/forms/html/cc/cc.html
+++ b/globalcollect_gateway/forms/html/cc/cc.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/dd/dd-recurring.html
b/globalcollect_gateway/forms/html/dd/dd-recurring.html
index ee8144c..690142f 100644
--- a/globalcollect_gateway/forms/html/dd/dd-recurring.html
+++ b/globalcollect_gateway/forms/html/dd/dd-recurring.html
@@ -112,7 +112,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden"
value="@owa_session" name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/dd/dd.html
b/globalcollect_gateway/forms/html/dd/dd.html
index 6b1328f..8ac91fe 100644
--- a/globalcollect_gateway/forms/html/dd/dd.html
+++ b/globalcollect_gateway/forms/html/dd/dd.html
@@ -112,7 +112,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden"
value="@owa_session" name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/ew/ew-alipay.html
b/globalcollect_gateway/forms/html/ew/ew-alipay.html
index ecbca29..62c8390 100644
--- a/globalcollect_gateway/forms/html/ew/ew-alipay.html
+++ b/globalcollect_gateway/forms/html/ew/ew-alipay.html
@@ -68,7 +68,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@gateway"
name="gateway"/>
<input type="hidden" value="ew"
name="payment_method"/>
diff --git a/globalcollect_gateway/forms/html/ew/ew-webmoney.html
b/globalcollect_gateway/forms/html/ew/ew-webmoney.html
index 181027b..8d9dd5a 100644
--- a/globalcollect_gateway/forms/html/ew/ew-webmoney.html
+++ b/globalcollect_gateway/forms/html/ew/ew-webmoney.html
@@ -99,7 +99,6 @@
<input type="hidden" value="@referrer" name="referrer"/>
<input type="hidden" value="@wmf_token" name="wmf_token"/>
<input type="hidden" value="@order_id" name="order_id"/>
- <input type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash" name="data_hash"/>
<input type="hidden" value="@gateway" name="gateway"/>
<input type="hidden" value="ew" name="payment_method"/>
diff --git a/globalcollect_gateway/forms/html/ew/ew-yandex.html
b/globalcollect_gateway/forms/html/ew/ew-yandex.html
index 79c2e71..13524bb 100644
--- a/globalcollect_gateway/forms/html/ew/ew-yandex.html
+++ b/globalcollect_gateway/forms/html/ew/ew-yandex.html
@@ -68,7 +68,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@gateway"
name="gateway"/>
<input type="hidden" value="ew"
name="payment_method"/>
diff --git a/globalcollect_gateway/forms/html/obt/obt-bpay.html
b/globalcollect_gateway/forms/html/obt/obt-bpay.html
index b982336..a2e99c7 100644
--- a/globalcollect_gateway/forms/html/obt/obt-bpay.html
+++ b/globalcollect_gateway/forms/html/obt/obt-bpay.html
@@ -81,7 +81,6 @@
<input type="hidden"
value="@referrer" name="referrer"/>
<input type="hidden"
value="@wmf_token" name="wmf_token"/>
<input type="hidden"
value="@order_id" name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden"
value="@data_hash" name="data_hash"/>
<input type="hidden"
value="@owa_session" name="owa_session"/>
<input type="hidden"
value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vm.html
b/globalcollect_gateway/forms/html/rcc/rcc-vm.html
index 18ff2b5..e1a21b3 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vm.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vm.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vma.html
b/globalcollect_gateway/forms/html/rcc/rcc-vma.html
index b00962f..345e23b 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vma.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vma.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
index 5d2f243..76dc827 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
index 8a29786..d31ae13 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
index f7d97e2..70befd5 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
index b2d23cb..d36121b 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
@@ -77,7 +77,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc.html
b/globalcollect_gateway/forms/html/rcc/rcc.html
index 5eb7fa6..366df63 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc.html
@@ -76,7 +76,6 @@
<input type="hidden" value="@referrer"
name="referrer"/>
<input type="hidden" value="@wmf_token"
name="wmf_token"/>
<input type="hidden" value="@order_id"
name="order_id"/>
- <input type="hidden"
value="@contribution_tracking_id" name="contribution_tracking_id"/>
<input type="hidden" value="@data_hash"
name="data_hash"/>
<input type="hidden" value="@owa_session"
name="owa_session"/>
<input type="hidden" value="@owa_ref"
name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html
index dc4863e..5a25c40 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html
@@ -86,7 +86,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html
index 22cc06a..9bc9ab2 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html
@@ -105,7 +105,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
index 12efe0c..aa71abf 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
@@ -105,7 +105,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
index d40f1c6..4ada131 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
@@ -105,7 +105,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html
index a41515a..6a82a7f 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html
@@ -102,7 +102,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html
b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html
index 0f257fb..038a158 100644
--- a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html
+++ b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html
@@ -106,7 +106,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects2nd-AU.html
b/globalcollect_gateway/forms/html/webitects2nd-AU.html
index 46a1c57..1aaa9c6 100644
--- a/globalcollect_gateway/forms/html/webitects2nd-AU.html
+++ b/globalcollect_gateway/forms/html/webitects2nd-AU.html
@@ -120,7 +120,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects2nd-US.html
b/globalcollect_gateway/forms/html/webitects2nd-US.html
index 58c69a4..200c8aa 100644
--- a/globalcollect_gateway/forms/html/webitects2nd-US.html
+++ b/globalcollect_gateway/forms/html/webitects2nd-US.html
@@ -112,7 +112,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects2nd-amex.html
b/globalcollect_gateway/forms/html/webitects2nd-amex.html
index 03758a8..c8fb71e 100644
--- a/globalcollect_gateway/forms/html/webitects2nd-amex.html
+++ b/globalcollect_gateway/forms/html/webitects2nd-amex.html
@@ -105,7 +105,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects2nd.html
b/globalcollect_gateway/forms/html/webitects2nd.html
index 06b8bc4..96514ca 100644
--- a/globalcollect_gateway/forms/html/webitects2nd.html
+++ b/globalcollect_gateway/forms/html/webitects2nd.html
@@ -105,7 +105,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects2nd_green-US.html
b/globalcollect_gateway/forms/html/webitects2nd_green-US.html
index 7d6c8d7..923f604 100644
--- a/globalcollect_gateway/forms/html/webitects2nd_green-US.html
+++ b/globalcollect_gateway/forms/html/webitects2nd_green-US.html
@@ -114,7 +114,6 @@
<input
type="hidden" value="@referrer" name="referrer"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects_2_3step-CA.html
b/globalcollect_gateway/forms/html/webitects_2_3step-CA.html
index 65c8752..307af9e 100644
--- a/globalcollect_gateway/forms/html/webitects_2_3step-CA.html
+++ b/globalcollect_gateway/forms/html/webitects_2_3step-CA.html
@@ -118,7 +118,6 @@
<input
type="hidden" value="@email-opt" name="email-opt"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects_2_3step.html
b/globalcollect_gateway/forms/html/webitects_2_3step.html
index 34e8881..2e51737 100644
--- a/globalcollect_gateway/forms/html/webitects_2_3step.html
+++ b/globalcollect_gateway/forms/html/webitects_2_3step.html
@@ -119,7 +119,6 @@
<input
type="hidden" value="@email-opt" name="email-opt"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
b/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
index 179b95a..d1de185 100644
--- a/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
+++ b/globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
@@ -120,7 +120,6 @@
<input
type="hidden" value="@email-opt" name="email-opt"/>
<input
type="hidden" value="@wmf_token" name="wmf_token"/>
<input
type="hidden" value="@order_id" name="order_id"/>
- <input
type="hidden" value="@contribution_tracking_id"
name="contribution_tracking_id"/>
<input
type="hidden" value="@data_hash" name="data_hash"/>
<input
type="hidden" value="@owa_session" name="owa_session"/>
<input
type="hidden" value="@owa_ref" name="owa_ref"/>
diff --git a/globalcollect_gateway/forms/js/gc.js
b/globalcollect_gateway/forms/js/gc.js
index 608ae5c..77fd74f 100644
--- a/globalcollect_gateway/forms/js/gc.js
+++ b/globalcollect_gateway/forms/js/gc.js
@@ -49,7 +49,6 @@
payment_method: 'cc',
language: language,
card_type: $( 'input[name="cardtype"]:checked'
).val().toLowerCase(),
- contribution_tracking_id: $(
'input[name="contribution_tracking_id"]' ).val(),
utm_source: $( 'input[name="utm_source"]' ).val(),
utm_campaign: $( 'input[name="utm_campaign"]' ).val(),
utm_medium: $( 'input[name="utm_medium"]' ).val(),
diff --git a/globalcollect_gateway/forms/js/webitects.js
b/globalcollect_gateway/forms/js/webitects.js
index 4828d8b..d5d6f94 100644
--- a/globalcollect_gateway/forms/js/webitects.js
+++ b/globalcollect_gateway/forms/js/webitects.js
@@ -54,7 +54,6 @@
payment_method: 'cc',
language: language,
card_type: $( 'input[name="cardtype"]:checked'
).val().toLowerCase(),
- contribution_tracking_id: $(
'input[name="contribution_tracking_id"]' ).val(),
utm_source: $( 'input[name="utm_source"]' ).val(),
utm_campaign: $( 'input[name="utm_campaign"]' ).val(),
utm_medium: $( 'input[name="utm_medium"]' ).val(),
diff --git a/tests/Adapter/GatewayAdapterTest.php
b/tests/Adapter/GatewayAdapterTest.php
index e36064f..c68c2bd 100644
--- a/tests/Adapter/GatewayAdapterTest.php
+++ b/tests/Adapter/GatewayAdapterTest.php
@@ -133,7 +133,6 @@
public function testResetOnGatewaySwitch() {
// Fill the session with some GlobalCollect stuff
$init = $this->getDonorTestData( 'FR' );
- $init['contribution_tracking_id'] = mt_rand();
$firstRequest = $this->setUpRequest( $init );
$globalcollect_gateway = new TestingGlobalCollectAdapter();
$globalcollect_gateway->do_transaction( 'Donate' );
@@ -141,7 +140,7 @@
$session = $firstRequest->getSessionArray();
$this->assertEquals( 'globalcollect',
$session['Donor']['gateway'], 'Test setup failed.' );
- //Then simpulate switching to Worldpay
+ //Then simulate switching to Worldpay
$session['sequence'] = 2;
unset( $init['order_id'] );
@@ -150,7 +149,8 @@
$worldpay_gateway->batch_mode = true;
$session = $secondRequest->getSessionArray();
- $expected_order_id =
"{$init['contribution_tracking_id']}.{$session['sequence']}";
+ $ctId = $worldpay_gateway->getData_Unstaged_Escaped(
'contribution_tracking_id' );
+ $expected_order_id = "$ctId.{$session['sequence']}";
$this->assertEquals( $expected_order_id,
$worldpay_gateway->getData_Unstaged_Escaped( 'order_id' ),
'Order ID was not regenerated on gateway switch!' );
}
diff --git a/worldpay_gateway/forms/html/worldpay-dd-test.html
b/worldpay_gateway/forms/html/worldpay-dd-test.html
index 4c3dc11..2eb46f6 100644
--- a/worldpay_gateway/forms/html/worldpay-dd-test.html
+++ b/worldpay_gateway/forms/html/worldpay-dd-test.html
@@ -111,7 +111,6 @@
<input
class="form-control" type="hidden" value="1" id="email-opt"/>
<input
class="form-control" type="hidden" value="@wmf_token" id="wmf_token"/>
<input
class="form-control" type="hidden" value="@order_id" id="order_id"/>
- <input
class="form-control" type="hidden" value="@contribution_tracking_id"
id="contribution_tracking_id"/>
<input
class="form-control" type="hidden" value="@data_hash" id="data_hash"/>
<input
class="form-control" type="hidden" value="@owa_session" id="owa_session"/>
<input
class="form-control" type="hidden" value="@owa_ref" id="owa_ref"/>
diff --git a/worldpay_gateway/forms/html/worldpay-test.html
b/worldpay_gateway/forms/html/worldpay-test.html
index 6608f98..2496d5d 100644
--- a/worldpay_gateway/forms/html/worldpay-test.html
+++ b/worldpay_gateway/forms/html/worldpay-test.html
@@ -65,7 +65,6 @@
<input
class="form-control" type="hidden" value="1" id="email-opt"/>
<input
class="form-control" type="hidden" value="@wmf_token" id="wmf_token"/>
<input
class="form-control" type="hidden" value="@order_id" id="order_id"/>
- <input
class="form-control" type="hidden" value="@contribution_tracking_id"
id="contribution_tracking_id"/>
<input
class="form-control" type="hidden" value="@data_hash" id="data_hash"/>
<input
class="form-control" type="hidden" value="@owa_session" id="owa_session"/>
<input
class="form-control" type="hidden" value="@owa_ref" id="owa_ref"/>
diff --git a/worldpay_gateway/forms/html/worldpay.html
b/worldpay_gateway/forms/html/worldpay.html
index 6925488..e425483 100644
--- a/worldpay_gateway/forms/html/worldpay.html
+++ b/worldpay_gateway/forms/html/worldpay.html
@@ -65,7 +65,6 @@
<input
class="form-control" type="hidden" value="1" id="email-opt"/>
<input
class="form-control" type="hidden" value="@wmf_token" id="wmf_token"/>
<input
class="form-control" type="hidden" value="@order_id" id="order_id"/>
- <input
class="form-control" type="hidden" value="@contribution_tracking_id"
id="contribution_tracking_id"/>
<input
class="form-control" type="hidden" value="@data_hash" id="data_hash"/>
<input
class="form-control" type="hidden" value="@owa_session" id="owa_session"/>
<input
class="form-control" type="hidden" value="@owa_ref" id="owa_ref"/>
diff --git a/worldpay_gateway/forms/js/worldpay.js
b/worldpay_gateway/forms/js/worldpay.js
index 034e93f..b3ba7b6 100644
--- a/worldpay_gateway/forms/js/worldpay.js
+++ b/worldpay_gateway/forms/js/worldpay.js
@@ -82,7 +82,7 @@
'email-opt',
'utm_source', 'utm_medium', 'utm_campaign',
'referrer',
'gateway', 'payment_method', 'language',
'wmf_token',
- 'order_id', 'contribution_tracking_id',
+ 'order_id',
// AVS Countries
'street', 'city', 'state', 'zip', 'country',
diff --git a/worldpay_gateway/i18n/en.json b/worldpay_gateway/i18n/en.json
index 981661d..1e070fd 100644
--- a/worldpay_gateway/i18n/en.json
+++ b/worldpay_gateway/i18n/en.json
@@ -14,7 +14,6 @@
"apihelp-di_wp_validate-param-payment_method": "",
"apihelp-di_wp_validate-param-language": "",
"apihelp-di_wp_validate-param-order_id": "",
- "apihelp-di_wp_validate-param-contribution_tracking_id": "",
"apihelp-di_wp_validate-param-street": "",
"apihelp-di_wp_validate-param-state": "",
"apihelp-di_wp_validate-param-zip": "",
diff --git a/worldpay_gateway/i18n/qqq.json b/worldpay_gateway/i18n/qqq.json
index b14bb82..5e3241a 100644
--- a/worldpay_gateway/i18n/qqq.json
+++ b/worldpay_gateway/i18n/qqq.json
@@ -12,7 +12,6 @@
"apihelp-di_wp_validate-param-payment_method":
"{{doc-apihelp-param|di_wp_validate|payment_method}}",
"apihelp-di_wp_validate-param-language":
"{{doc-apihelp-param|di_wp_validate|language}}",
"apihelp-di_wp_validate-param-order_id":
"{{doc-apihelp-param|di_wp_validate|order_id}}",
- "apihelp-di_wp_validate-param-contribution_tracking_id":
"{{doc-apihelp-param|di_wp_validate|contribution_tracking_id}}",
"apihelp-di_wp_validate-param-street":
"{{doc-apihelp-param|di_wp_validate|street}}",
"apihelp-di_wp_validate-param-state":
"{{doc-apihelp-param|di_wp_validate|state}}",
"apihelp-di_wp_validate-param-zip":
"{{doc-apihelp-param|di_wp_validate|zip}}",
diff --git a/worldpay_gateway/worldpay.api.php
b/worldpay_gateway/worldpay.api.php
index f48f8dc..fc91c12 100644
--- a/worldpay_gateway/worldpay.api.php
+++ b/worldpay_gateway/worldpay.api.php
@@ -6,7 +6,7 @@
'email-opt',
'utm_source','utm_medium','utm_campaign','referrer',
'gateway','payment_method', 'payment_submethod',
'language','wmf_token',
- 'order_id','contribution_tracking_id', 'amount', 'ffname',
+ 'order_id', 'amount', 'ffname',
// AVS Countries
'street','state','zip','country','city',
--
To view, visit https://gerrit.wikimedia.org/r/289731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92c90f20069b1633d21032be30e6770a65d24a14
Gerrit-PatchSet: 7
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: Ejegg <eeggles...@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
