jenkins-bot has submitted this change and it was merged.
Change subject: Mustache for obt_bpay
......................................................................
Mustache for obt_bpay
Change-Id: If384791067ed44229affeb80286f384c1566c661
---
M DonationInterfaceFormSettings.php
M globalcollect_gateway/config/payment_methods.yaml
D globalcollect_gateway/forms/html/obt/obt-bpay.html
M globalcollect_gateway/globalcollect.adapter.php
4 files changed, 4 insertions(+), 107 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DonationInterfaceFormSettings.php
b/DonationInterfaceFormSettings.php
index 3451d67..32b9e47 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -40,9 +40,6 @@
********/
$forms_whitelist['obt-bpay'] = array(
- 'file' => $form_dirs['gc'] . '/obt/obt-bpay.html',
- 'dependencies' => 'gc.form.rapidhtml.webitects.2nd',
- 'styles' => 'di.form.rapidhtml.webitects.2nd.styles',
'gateway' => 'globalcollect',
'countries' => array( '+' => 'AU'),
'currencies' => array( '+' => 'AUD'),
diff --git a/globalcollect_gateway/config/payment_methods.yaml
b/globalcollect_gateway/config/payment_methods.yaml
index cef32ce..5f1bdf5 100644
--- a/globalcollect_gateway/config/payment_methods.yaml
+++ b/globalcollect_gateway/config/payment_methods.yaml
@@ -24,6 +24,8 @@
obt:
label: 'Online bank transfer'
validation:
+ name: true
+ email: true
creditCard: false
short_circuit_at: first_iop
rtbt:
diff --git a/globalcollect_gateway/forms/html/obt/obt-bpay.html
b/globalcollect_gateway/forms/html/obt/obt-bpay.html
deleted file mode 100644
index f048eea..0000000
--- a/globalcollect_gateway/forms/html/obt/obt-bpay.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<script type="text/javascript">
- // these must go through RapidHTML and thus are inline
- var amountErrors =
["#general|escape",'#retryMsg|escape','#amount|escape'];
- var billingErrors =
['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#email|escape'];
- var paymentErrors =
['#card_num|escape','#card_type|escape','#cvv|escape'];
- var actionURL = "@action";
- var scriptPath = "@script_path";
-</script>
-<!--[if IE 7]>
-<style>
- .gainlayout {
- zoom: 1;
- height: 1%;
- }
-</style>
-<![endif]-->
-<script type="text/javascript">
-$( document ).ready( function() {
- $( ".collapsingCity input" ).removeClass( "optional" );
- $( ".collapsingCity" ).css( "display", "table-row" );
-} );
-</script>
-
-<div class="ltr">
- <table id="layouttable">
- <tr>
- <td>
- <div id="appeal">
- <div id="appeal-content">
- <h2 id="appeal-head"> <span
class="mw-headline">{{LanguageSwitch|2011FR/@appeal/title|@language}}</span></h2>
- <div id="appeal-body"
class="plainlinks">{{LanguageSwitch|2011FR/@appeal/text|@language}}</div>
- </div>
- </div>
- </td>
- <td id="donate">
- <div class="donor">
- <p id="topError"></p>
-
- <form method="post"
name="paypalcontribution">
- <table id="payment-table-donor">
- <tbody>
- <tr>
- <td>
- <div
id="step1header">
-
<h3 class="amount_header">%donate_interface-amount-legend%: <span
id="selected-amount">{% block donation-amount currency_code %}</span></h3>
- </div>
- </td>
- </tr>
- {% block
personal-information country %}
- <tr>
- <td>
- <div
id="bt-continue" style="margin-top: 10px;"> <input class="btn"
id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
- <div
id="bpay">
-
<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/BPAY_Landscape_MONO.gif"
alt="BPAY" width="100" >
-
<p>® Registered to BPAY Pty Ltd ABN 69 079 137 518</p>
- </div>
- </td>
- </tr>
- </table>
-
- <input type="hidden"
name="returnto" value="Thank_You/en" />
- <input type="hidden" value="0"
name="PaypalRedirect" id="PaypalRedirect">
-
- <input type="hidden"
value="@amount" name="amount" />
- <input type="hidden" value="AU"
name="country" id="country" />
- <input type="hidden"
value="AUD" name="currency_code" />
- <input type="hidden"
value="@utm_source" name="utm_source"/>
- <input type="hidden"
value="@utm_medium" name="utm_medium"/>
- <input type="hidden"
value="@utm_campaign" name="utm_campaign"/>
- <input type="hidden"
value="@language" name="language"/>
- <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="@data_hash" name="data_hash"/>
- <input type="hidden"
value="@owa_session" name="owa_session"/>
- <input type="hidden"
value="@owa_ref" name="owa_ref"/>
- <!-- new required fields -->
- <input type="hidden"
value="@gateway" name="gateway"/>
- <!-- required fields for bt and
dd -->
- <input type="hidden"
value="obt" name="payment_method"/>
- <input type="hidden"
value="bpay" name="payment_submethod"/>
- </form>
- </div>
- <p
id="informationsharing">%donate_interface-informationsharing|url%</p>
- <table>
- <tr>
- <td>
- {% block moreinfolinks
%}
- </td>
- <td>@verisign_logo</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-
-
-
-</div>
-
-<!-- Wikimedia Project logo
-<li id="footer-copyrightico"><a href="//wikimediafoundation.org/"><img
src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31"
alt="Wikimedia Foundation"/></a></li>
- -->
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index 9fce34d..8d6bf8d 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -39,7 +39,8 @@
}
if (
$this->getPaymentMethod() === 'cc' ||
- $this->getPaymentMethod() === 'rtbt'
+ $this->getPaymentMethod() === 'rtbt' ||
+ $this->getPaymentMethod() === 'obt'
) {
return 'Gateway_Form_Mustache';
};
--
To view, visit https://gerrit.wikimedia.org/r/298572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If384791067ed44229affeb80286f384c1566c661
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[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
