[MediaWiki-commits] [Gerrit] Forms support for Boletos - change (mediawiki...DonationInterface)
Katie Horn has submitted this change and it was merged.
Change subject: Forms support for Boletos
..
Forms support for Boletos
Change-Id: I1dcaac35bfc4d0bc42fa3b5f6ab44b6b699c1a62
---
M donationinterface.php
M gateway_common/DonationData.php
M gateway_common/interface.i18n.php
M gateway_forms/RapidHtml.php
M gateway_forms/rapidhtml/RapidHtmlResources.php
M globalcollect_gateway/forms/html/_personal-information/default.html
A globalcollect_gateway/forms/html/cash/boletos.html
A globalcollect_gateway/forms/js/gc.boletos.js
M globalcollect_gateway/globalcollect.adapter.php
M modules/validate_input.js
10 files changed, 183 insertions(+), 10 deletions(-)
Approvals:
Katie Horn: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/donationinterface.php b/donationinterface.php
index 5aa90d4..16bbe05 100644
--- a/donationinterface.php
+++ b/donationinterface.php
@@ -901,6 +901,7 @@
'donate_interface-error-msg-card_num',
'donate_interface-error-msg-expiration',
'donate_interface-error-msg-cvv',
+ 'donate_interface-error-msg-fiscal_number',
'donate_interface-error-msg-captcha',
'donate_interface-error-msg-captcha-please',
'donate_interface-error-msg-cookies',
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index e10f652..a3b10ef 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -132,6 +132,7 @@
'date_collect' = $wgRequest-getText(
'date_collect', null ),
'direct_debit_text' = $wgRequest-getText(
'direct_debit_text', null ),
'iban' = $wgRequest-getText( 'iban', null ),
+ 'fiscal_number' = $wgRequest-getText(
'fiscal_number', null ),
'transaction_type' = $wgRequest-getText(
'transaction_type', null ),
'form_name' = $wgRequest-getText(
'form_name', null ),
'ffname' = $wgRequest-getText( 'ffname', null
),
diff --git a/gateway_common/interface.i18n.php
b/gateway_common/interface.i18n.php
index e6c6006..aeb5e31 100644
--- a/gateway_common/interface.i18n.php
+++ b/gateway_common/interface.i18n.php
@@ -166,6 +166,7 @@
'donate_interface-donor-security' = 'Security code',
'donate_interface-donor-submit' = 'Donate',
'donate_interface-donor-currency-msg' = 'This donation is being made
in $1',
+ 'donate_interface-donor-fiscal_number' = 'Fiscal number',
'donate_interface-card-name-amex' = 'American Express',
'donate_interface-card-name-visa' = 'Visa',
'donate_interface-card-name-mc' = 'MasterCard',
@@ -202,6 +203,7 @@
'donate_interface-error-msg-cookies' = 'Please enable cookies in your
browser.',
'donate_interface-error-msg-genaricrequired' = 'This field is
required',
'donate_interface-error-msg-country-calc' = 'Error - We are unable to
accept your donation at this time.',
+ 'donate_interface-error-msg-fiscal_number' = 'fiscal number',
'donate_interface-donate-error-try-a-different-card' = 'Please [$1 try
a different card] or one of our [$2 other ways to give] or contact us at $3',
'donate_interface-donate-error-thank-you-for-your-support' = 'Thank
you for your support!',
'php-response-declined' = 'Your transaction could not be accepted.',
diff --git a/gateway_forms/RapidHtml.php b/gateway_forms/RapidHtml.php
index c9b9aea..0b6a93a 100644
--- a/gateway_forms/RapidHtml.php
+++ b/gateway_forms/RapidHtml.php
@@ -69,6 +69,8 @@
'@bank_name',
'@bank_check_digit',
'@branch_code',
+ // Boletos
+ '@fiscal_number',
// Not actually data tokens, but available to you in html form:
// @captcha - the captcha form
// @script_path - maps to $wgScriptPath
@@ -99,6 +101,7 @@
'#state',
'#zip',
'#emailAdd',
+ '#fiscal_number',
);
public function __construct( $gateway ) {
diff --git a/gateway_forms/rapidhtml/RapidHtmlResources.php
b/gateway_forms/rapidhtml/RapidHtmlResources.php
index edc90cf..7f2388a 100644
--- a/gateway_forms/rapidhtml/RapidHtmlResources.php
+++ b/gateway_forms/rapidhtml/RapidHtmlResources.php
@@ -145,7 +145,6 @@
$wgResourceModules[ 'gc.form.rapidhtml.dd' ] = array(
'styles' = 'css/gc.css',
'scripts' = array(
-// 'js/gc.js',
'js/gc.dd.js'
),
// 'dependencies' = array( 'di.form.core.validate' ),
@@ -155,13 +154,21 @@
$wgResourceModules[ 'gc.form.rapidhtml.ew' ] = array(
'styles' = 'css/gc.css',
'scripts' = array(
-'js/gc.js',
'js/gc.ew.js'
[MediaWiki-commits] [Gerrit] Forms support for Boletos - change (mediawiki...DonationInterface)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51584
Change subject: Forms support for Boletos
..
Forms support for Boletos
Change-Id: I1dcaac35bfc4d0bc42fa3b5f6ab44b6b699c1a62
---
M donationinterface.php
M gateway_common/DonationData.php
M gateway_common/interface.i18n.php
M gateway_forms/RapidHtml.php
M gateway_forms/rapidhtml/RapidHtmlResources.php
M globalcollect_gateway/forms/html/_personal-information/default.html
A globalcollect_gateway/forms/html/cash/boletos.html
A globalcollect_gateway/forms/js/gc.boletos.js
M globalcollect_gateway/globalcollect.adapter.php
M modules/validate_input.js
10 files changed, 172 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/84/51584/1
diff --git a/donationinterface.php b/donationinterface.php
index 5aa90d4..16bbe05 100644
--- a/donationinterface.php
+++ b/donationinterface.php
@@ -901,6 +901,7 @@
'donate_interface-error-msg-card_num',
'donate_interface-error-msg-expiration',
'donate_interface-error-msg-cvv',
+ 'donate_interface-error-msg-fiscal_number',
'donate_interface-error-msg-captcha',
'donate_interface-error-msg-captcha-please',
'donate_interface-error-msg-cookies',
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index e10f652..a3b10ef 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -132,6 +132,7 @@
'date_collect' = $wgRequest-getText(
'date_collect', null ),
'direct_debit_text' = $wgRequest-getText(
'direct_debit_text', null ),
'iban' = $wgRequest-getText( 'iban', null ),
+ 'fiscal_number' = $wgRequest-getText(
'fiscal_number', null ),
'transaction_type' = $wgRequest-getText(
'transaction_type', null ),
'form_name' = $wgRequest-getText(
'form_name', null ),
'ffname' = $wgRequest-getText( 'ffname', null
),
diff --git a/gateway_common/interface.i18n.php
b/gateway_common/interface.i18n.php
index e6c6006..aeb5e31 100644
--- a/gateway_common/interface.i18n.php
+++ b/gateway_common/interface.i18n.php
@@ -166,6 +166,7 @@
'donate_interface-donor-security' = 'Security code',
'donate_interface-donor-submit' = 'Donate',
'donate_interface-donor-currency-msg' = 'This donation is being made
in $1',
+ 'donate_interface-donor-fiscal_number' = 'Fiscal number',
'donate_interface-card-name-amex' = 'American Express',
'donate_interface-card-name-visa' = 'Visa',
'donate_interface-card-name-mc' = 'MasterCard',
@@ -202,6 +203,7 @@
'donate_interface-error-msg-cookies' = 'Please enable cookies in your
browser.',
'donate_interface-error-msg-genaricrequired' = 'This field is
required',
'donate_interface-error-msg-country-calc' = 'Error - We are unable to
accept your donation at this time.',
+ 'donate_interface-error-msg-fiscal_number' = 'fiscal number',
'donate_interface-donate-error-try-a-different-card' = 'Please [$1 try
a different card] or one of our [$2 other ways to give] or contact us at $3',
'donate_interface-donate-error-thank-you-for-your-support' = 'Thank
you for your support!',
'php-response-declined' = 'Your transaction could not be accepted.',
diff --git a/gateway_forms/RapidHtml.php b/gateway_forms/RapidHtml.php
index c9b9aea..0b6a93a 100644
--- a/gateway_forms/RapidHtml.php
+++ b/gateway_forms/RapidHtml.php
@@ -69,6 +69,8 @@
'@bank_name',
'@bank_check_digit',
'@branch_code',
+ // Boletos
+ '@fiscal_number',
// Not actually data tokens, but available to you in html form:
// @captcha - the captcha form
// @script_path - maps to $wgScriptPath
@@ -99,6 +101,7 @@
'#state',
'#zip',
'#emailAdd',
+ '#fiscal_number',
);
public function __construct( $gateway ) {
diff --git a/gateway_forms/rapidhtml/RapidHtmlResources.php
b/gateway_forms/rapidhtml/RapidHtmlResources.php
index edc90cf..7f2388a 100644
--- a/gateway_forms/rapidhtml/RapidHtmlResources.php
+++ b/gateway_forms/rapidhtml/RapidHtmlResources.php
@@ -145,7 +145,6 @@
$wgResourceModules[ 'gc.form.rapidhtml.dd' ] = array(
'styles' = 'css/gc.css',
'scripts' = array(
-// 'js/gc.js',
'js/gc.dd.js'
),
// 'dependencies' = array( 'di.form.core.validate' ),
@@ -155,13 +154,21 @@
$wgResourceModules[ 'gc.form.rapidhtml.ew' ] = array(
'styles' = 'css/gc.css',
'scripts' =
