r102236 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r102235‎ | r102236 | r102237 >
Date:03:06, 7 November 2011
Author:khorn
Status:ok
Tags:
Comment:
MFT r90286, r100671, r100837, r100950, r101060, r101063, r101064, r101073, r101076, r101335, r101553, r101557, r101561, r101785, r101823, r101826, r101837, r101870, r101871, r101872, r101882, r101890, r101910, r101947, r101949, r101950, r101951, r101955, r101956, r101957, r101958, r101959, r101960, r101964, r101965, r101966, r102030, r102032, r102033, r102047, r102050, r102051, r102052, r102054, r102056, r102058, r102065, r102081, r102085, r102086, r102087, r102118, r102120, r102124, r102125, r102127, r102134, r102140, r102147, r102151, r102152, r102155, r102156, r102186, r102188
...yarly.
Modified paths:
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras/custom_filters/filters/functions (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-CA.html (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-US.html (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt.html (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras/custom_filters/filters/functions/functions.body.php
——@@ -0,0 +1,63 @@
 2+<?php
 3+
 4+class Gateway_Extras_CustomFilters_Functions extends Gateway_Extras {
 5+
 6+ /**
 7+ * Container for an instance of self
 8+ * @var object
 9+ */
 10+ static $instance;
 11+
 12+ /**
 13+ * Custom filter object holder
 14+ * @var object
 15+ */
 16+ public $cfo;
 17+
 18+ public function __construct( &$gateway_adapter, &$custom_filter_object ) {
 19+ parent::__construct( $gateway_adapter );
 20+ $this->cfo = & $custom_filter_object;
 21+ }
 22+
 23+ public function filter() {
 24+
 25+ $functions = $this->gateway_adapter->getGlobal( 'CustomFiltersFunctions' );
 26+ foreach ( $functions as $function_name => $risk_score_modifier ) {
 27+ //run the function specified, if it exists.
 28+ if ( method_exists( $this->gateway_adapter, $function_name ) ) {
 29+ $score = $this->gateway_adapter->{$function_name}();
 30+ if ( is_null( $score ) ){
 31+ $score = 0; //TODO: Is this the correct behavior?
 32+ } elseif ( is_bool( $score ) ) {
 33+ $score = ( $score ? 0 : $risk_score_modifier );
 34+ } elseif ( is_numeric( $score ) && $score <= 100 ) {
 35+ $score = $score * $risk_score_modifier / 100;
 36+ } else {
 37+// error_log("Function Filter: $function_name returned $score");
 38+ throw new MWException( "Filter functions are returning somekinda nonsense." );
 39+ }
 40+
 41+ $this->cfo->risk_score += $score;
 42+ }
 43+ }
 44+
 45+ return TRUE;
 46+ }
 47+
 48+ static function onFilter( &$gateway_adapter, &$custom_filter_object ) {
 49+ if ( !$gateway_adapter->getGlobal( 'EnableFunctionsFilter' ) ||
 50+ !count( $gateway_adapter->getGlobal( 'CustomFiltersFunctions' ) ) ){
 51+ return true;
 52+ }
 53+ $gateway_adapter->debugarray[] = 'functions onFilter hook!';
 54+ return self::singleton( $gateway_adapter, $custom_filter_object )->filter();
 55+ }
 56+
 57+ static function singleton( &$gateway_adapter, &$custom_filter_object ) {
 58+ if ( !self::$instance ) {
 59+ self::$instance = new self( $gateway_adapter, $custom_filter_object );
 60+ }
 61+ return self::$instance;
 62+ }
 63+
 64+}
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/extras/custom_filters/filters/functions/functions.body.php
___________________________________________________________________
Added: svn:eol-style
165 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt.html
——@@ -0,0 +1,121 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.webitects.bt');
 4+ // these must go through RapidHTML and thus are inline
 5+ var amountErrors = ["#general|escape",'#retryMsg|escape','#amount|escape'];
 6+ var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
 7+ var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'];
 8+ var actionURL = "@action";
 9+ var scriptPath = "@script_path";
 10+</script>
 11+<!--[if lt IE 7]>
 12+<script type="text/javascript">
 13+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
 14+</script>
 15+<style type="text/css">
 16+ body{
 17+ behavior: url("@script_path/skins/vector/csshover.min.htc");
 18+ }
 19+</style><![endif]-->
 20+<!--[if IE 7]>
 21+<style>
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
 28+
 29+<div class="ltr">
 30+ <table id="layouttable">
 31+ <tr>
 32+ <td>
 33+ <div id="appeal">
 34+ <div id="appeal-content">
 35+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal-title|@language}}</span></h2>
 36+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
 40+ <td>
 41+ <div id="donate">
 42+ <div id="donate-content">
 43+ <div id="donate-body" style="padding: 0 1em;">
 44+ <form method="post" name="paypalcontribution">
 45+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">@amount @currency_code</span></h3></div>
 46+ <div id="amtErrorMessages" class="small"></div>
 47+ <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 48+ <div id="step2wrapper">
 49+ <div id="billing-content" class="gainlayout">
 50+ <div id="billingErrorMessages" class="small"></div>
 51+ <div id="paymentErrorMessages" class="small"></div>
 52+ <div class="name-fields">
 53+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 54+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 55+ </div>
 56+ <div class="loc-fields nostate">
 57+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 58+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 59+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-donor-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>
 60+ </div>
 61+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 62+ <div id="bt-continue" style="margin-top: 10px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
 63+ </div>
 64+ </div>
 65+
 66+
 67+
 68+ <input type="hidden" name="returnto" value="Thank_You/en" />
 69+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 70+
 71+ <input type="hidden" value="@amount" name="amount" />
 72+ <input type="hidden" value="@country" name="country" id="country" />
 73+ <input type="hidden" value="@currency_code" name="currency_code" />
 74+ <input type="hidden" value="@utm_source" name="utm_source"/>
 75+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 76+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 77+ <input type="hidden" value="@language" name="language"/>
 78+ <input type="hidden" value="@referrer" name="referrer"/>
 79+ <input type="hidden" value="@comment" name="comment"/>
 80+ <input type="hidden" value="@comment-option" name="comment-option"/>
 81+ <input type="hidden" value="1" name="email-opt"/>
 82+ <input type="hidden" value="@token" name="token"/>
 83+ <input type="hidden" value="@order_id" name="order_id"/>
 84+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 85+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 86+ <input type="hidden" value="@data_hash" name="data_hash"/>
 87+ <input type="hidden" value="@owa_session" name="owa_session"/>
 88+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 89+ <!-- new required fields -->
 90+ <input type="hidden" value="@gateway" name="gateway"/>
 91+ <input type="hidden" value="@payment_method" name="payment_method"/>
 92+ <!-- required fields for bt and dd -->
 93+ <input type="hidden" value="bt" name="payment_method"/>
 94+ <input type="hidden" value="bt" name="payment_submethod"/>
 95+ <!-- required fields omitted above -->
 96+ <input type="hidden" value="XX" name="state"/>
 97+ </form>
 98+ <div id="where-content">
 99+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 100+ </div>
 101+ </div>
 102+ </div>
 103+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 104+ <!-- TODO: links inside the message or not? -->
 105+ <ul id="moreinfolinks">
 106+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 107+ <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link -->
 108+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 109+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 110+ </ul>
 111+ </div>
 112+ </td>
 113+ </tr>
 114+ </table>
 115+
 116+
 117+
 118+</div>
 119+
 120+<!-- Wikimedia Project logo
 121+<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
 122+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt.html
___________________________________________________________________
Added: svn:eol-style
1123 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-CA.html
——@@ -0,0 +1,125 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.webitects.bt');
 4+ // these must go through RapidHTML and thus are inline
 5+ var amountErrors = ["#general|escape",'#retryMsg|escape','#amount|escape'];
 6+ var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
 7+ var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'];
 8+ var actionURL = "@action";
 9+ var scriptPath = "@script_path";
 10+</script>
 11+<!--[if lt IE 7]>
 12+<script type="text/javascript">
 13+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
 14+</script>
 15+<style type="text/css">
 16+ body{
 17+ behavior: url("@script_path/skins/vector/csshover.min.htc");
 18+ }
 19+</style><![endif]-->
 20+<!--[if IE 7]>
 21+<style>
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
 28+
 29+<div class="ltr">
 30+ <table id="layouttable">
 31+ <tr>
 32+ <td>
 33+ <div id="appeal">
 34+ <div id="appeal-content">
 35+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal-title|@language}}</span></h2>
 36+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
 40+ <td>
 41+ <div id="donate">
 42+ <div id="donate-content">
 43+ <div id="donate-body" style="padding: 0 1em;">
 44+ <form method="post" name="paypalcontribution">
 45+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">@amount @currency_code</span></h3></div>
 46+ <div id="amtErrorMessages" class="small"></div>
 47+ <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 48+ <div id="step2wrapper">
 49+ <div id="billing-content" class="gainlayout">
 50+ <div id="billingErrorMessages" class="small"></div>
 51+ <div id="paymentErrorMessages" class="small"></div>
 52+ <div class="name-fields">
 53+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 54+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 55+ </div>
 56+ <div class="loc-fields">
 57+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 58+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 59+ <span class="loc-state">
 60+ <select id="state" name="state" class="txt" value="@state" >
 61+ <option value=""></option>
 62+ <option value=""></option><option value="AB">AB</option><option value="BC">BC</option><option value="MB">MB</option><option value="NB">NB</option><option value="NL">NL</option><option value="NS">NS</option><option value="ON">ON</option><option value="PE">PE</option><option value="QC">QC</option><option value="SK">SK</option>
 63+ </select>
 64+ </span>
 65+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-postal%" value="@zip" placeholder="%donate_interface-donor-postal%"/></span>
 66+ </div>
 67+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 68+ <div id="bt-continue" style="margin-top: 10px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
 69+ </div>
 70+ </div>
 71+
 72+
 73+
 74+ <input type="hidden" name="returnto" value="Thank_You/en" />
 75+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 76+
 77+ <input type="hidden" value="@amount" name="amount" />
 78+ <input type="hidden" value="CA" name="country" id="country" />
 79+ <input type="hidden" value="@currency_code" name="currency_code" />
 80+ <input type="hidden" value="@utm_source" name="utm_source"/>
 81+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 82+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 83+ <input type="hidden" value="@language" name="language"/>
 84+ <input type="hidden" value="@referrer" name="referrer"/>
 85+ <input type="hidden" value="@comment" name="comment"/>
 86+ <input type="hidden" value="@comment-option" name="comment-option"/>
 87+ <input type="hidden" value="1" name="email-opt"/>
 88+ <input type="hidden" value="@token" name="token"/>
 89+ <input type="hidden" value="@order_id" name="order_id"/>
 90+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 91+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 92+ <input type="hidden" value="@data_hash" name="data_hash"/>
 93+ <input type="hidden" value="@owa_session" name="owa_session"/>
 94+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 95+ <!-- new required fields -->
 96+ <input type="hidden" value="@gateway" name="gateway"/>
 97+ <input type="hidden" value="@payment_method" name="payment_method"/>
 98+ <!-- required fields for bt and dd -->
 99+ <input type="hidden" value="bt" name="payment_method"/>
 100+ <input type="hidden" value="bt" name="payment_submethod"/>
 101+ </form>
 102+ <div id="where-content">
 103+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 104+ </div>
 105+ </div>
 106+ </div>
 107+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 108+ <!-- TODO: links inside the message or not? -->
 109+ <ul id="moreinfolinks">
 110+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 111+ <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link -->
 112+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 113+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 114+ </ul>
 115+ </div>
 116+ </td>
 117+ </tr>
 118+ </table>
 119+
 120+
 121+
 122+</div>
 123+
 124+<!-- Wikimedia Project logo
 125+<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
 126+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-CA.html
___________________________________________________________________
Added: svn:eol-style
1127 + native
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-US.html
——@@ -0,0 +1,125 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('gc.form.rapidhtml.webitects.bt');
 4+ // these must go through RapidHTML and thus are inline
 5+ var amountErrors = ["#general|escape",'#retryMsg|escape','#amount|escape'];
 6+ var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape'];
 7+ var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape'];
 8+ var actionURL = "@action";
 9+ var scriptPath = "@script_path";
 10+</script>
 11+<!--[if lt IE 7]>
 12+<script type="text/javascript">
 13+ mw.loader.load('gc.form.rapidhtml.webitects.ie6');
 14+</script>
 15+<style type="text/css">
 16+ body{
 17+ behavior: url("@script_path/skins/vector/csshover.min.htc");
 18+ }
 19+</style><![endif]-->
 20+<!--[if IE 7]>
 21+<style>
 22+ .gainlayout {
 23+ zoom: 1;
 24+ height: 1%;
 25+ }
 26+</style>
 27+<![endif]-->
 28+
 29+<div class="ltr">
 30+ <table id="layouttable">
 31+ <tr>
 32+ <td>
 33+ <div id="appeal">
 34+ <div id="appeal-content">
 35+ <h2 id="appeal-head"> <span class="mw-headline">{{LanguageSwitch|2011FR/@appeal-title|@language}}</span></h2>
 36+ <div id="appeal-body" class="plainlinks">{{LanguageSwitch|2011FR/@appeal|@language}}</div>
 37+ </div>
 38+ </div>
 39+ </td>
 40+ <td>
 41+ <div id="donate">
 42+ <div id="donate-content">
 43+ <div id="donate-body" style="padding: 0 1em;">
 44+ <form method="post" name="paypalcontribution">
 45+ <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount">@amount @currency_code</span></h3></div>
 46+ <div id="amtErrorMessages" class="small"></div>
 47+ <div id="step2header"><h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div>
 48+ <div id="step2wrapper">
 49+ <div id="billing-content" class="gainlayout">
 50+ <div id="billingErrorMessages" class="small"></div>
 51+ <div id="paymentErrorMessages" class="small"></div>
 52+ <div class="name-fields">
 53+ <span class="name-first"><input class="txt" id="fname" name="fname" title="%donate_interface-donor-fname%" value="@fname" placeholder="%donate_interface-donor-fname%"/></span>
 54+ <span class="name-last"><input class="txt" id="lname" name="lname" title="%donate_interface-donor-lname%" value="@lname" placeholder="%donate_interface-donor-lname%"/></span>
 55+ </div>
 56+ <div class="loc-fields">
 57+ <span class="loc-street"><input class="txt" id="street" name="street" title="%donate_interface-donor-street%" value="@street" placeholder="%donate_interface-donor-street%"/></span>
 58+ <span class="loc-city"><input class="txt" id="city" name="city" title="%donate_interface-donor-city%" value="@city" placeholder="%donate_interface-donor-city%"/></span>
 59+ <span class="loc-state">
 60+ <select id="state" name="state" class="txt" value="@state" >
 61+ <option value=""></option>
 62+ <option value="AK">AK</option><option value="AL">AL</option><option value="AR">AR</option><option value="AZ">AZ</option><option value="CA">CA</option><option value="CO">CO</option><option value="CT">CT</option><option value="DC">DC</option><option value="DE">DE</option><option value="FL">FL</option><option value="GA">GA</option><option value="HI">HI</option><option value="IA">IA</option><option value="ID">ID</option><option value="IL">IL</option><option value="IN">IN</option><option value="KS">KS</option><option value="KY">KY</option><option value="LA">LA</option><option value="MA">MA</option><option value="MD">MD</option><option value="ME">ME</option><option value="MI">MI</option><option value="MN">MN</option><option value="MO">MO</option><option value="MS">MS</option><option value="MT">MT</option><option value="NC">NC</option><option value="ND">ND</option><option value="NE">NE</option><option value="NH">NH</option><option value="NJ">NJ</option><option value="NM">NM</option><option value="NV">NV</option><option value="NY">NY</option><option value="OH">OH</option><option value="OK">OK</option><option value="OR">OR</option><option value="PA">PA</option><option value="PR">PR</option><option value="RI">RI</option><option value="SC">SC</option><option value="SD">SD</option><option value="TN">TN</option><option value="TX">TX</option><option value="UT">UT</option><option value="VA">VA</option><option value="VT">VT</option><option value="WA">WA</option><option value="WI">WI</option><option value="WV">WV</option><option value="WY">WY</option><option value="AA">AA</option><option value="AE">AE</option><option value="AP">AP</option>
 63+ </select>
 64+ </span>
 65+ <span class="loc-postal"><input class="txt" id="zip" name="zip" title="%donate_interface-zip%" value="@zip" placeholder="%donate_interface-donor-zip%"/></span> <!-- TODO: use postal code on non-US -->
 66+ </div>
 67+ <p><input class="txt" title="%donate_interface-donor-email%" id="emailAdd" name="emailAdd" value="@emailAdd" placeholder="%donate_interface-donor-email%"/></p>
 68+ <div id="bt-continue" style="margin-top: 10px;"> <input class="btn" id="bt-continueBtn" type="button" value="%donate_interface-continue%" /></div>
 69+ </div>
 70+ </div>
 71+
 72+
 73+
 74+ <input type="hidden" name="returnto" value="Thank_You/en" />
 75+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 76+
 77+ <input type="hidden" value="@amount" name="amount" />
 78+ <input type="hidden" value="US" name="country" id="country" />
 79+ <input type="hidden" value="@currency_code" name="currency_code" />
 80+ <input type="hidden" value="@utm_source" name="utm_source"/>
 81+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 82+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 83+ <input type="hidden" value="@language" name="language"/>
 84+ <input type="hidden" value="@referrer" name="referrer"/>
 85+ <input type="hidden" value="@comment" name="comment"/>
 86+ <input type="hidden" value="@comment-option" name="comment-option"/>
 87+ <input type="hidden" value="1" name="email-opt"/>
 88+ <input type="hidden" value="@token" name="token"/>
 89+ <input type="hidden" value="@order_id" name="order_id"/>
 90+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 91+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 92+ <input type="hidden" value="@data_hash" name="data_hash"/>
 93+ <input type="hidden" value="@owa_session" name="owa_session"/>
 94+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 95+ <!-- new required fields -->
 96+ <input type="hidden" value="@gateway" name="gateway"/>
 97+ <input type="hidden" value="@payment_method" name="payment_method"/>
 98+ <!-- required fields for bt and dd -->
 99+ <input type="hidden" value="bt" name="payment_method"/>
 100+ <input type="hidden" value="bt" name="payment_submethod"/>
 101+ </form>
 102+ <div id="where-content">
 103+ {{LanguageSwitch|2011FR/core-appeal-whitebox-nodiv|@language}}
 104+ </div>
 105+ </div>
 106+ </div>
 107+ <p id="informationsharing">%donate_interface-informationsharing|url%</p>
 108+ <!-- TODO: links inside the message or not? -->
 109+ <ul id="moreinfolinks">
 110+ <li><a href="http://wikimediafoundation.org/wiki/Monthly_donations/en/US">%donate_interface-monthly-donation%</a></li><!-- TODO: localize the link -->
 111+ <li>%donate_interface-otherways-short|url%</li><!-- TODO: localize the link -->
 112+ <li><a href="http://wikimediafoundation.org/wiki/FAQ/en">%donate_interface-faqs%</a></li><!-- TODO: localize the link -->
 113+ <!--<li><a href="">%donate_interface-tax-info%</a></li>--><!-- TODO: localize the link -->
 114+ </ul>
 115+ </div>
 116+ </td>
 117+ </tr>
 118+ </table>
 119+
 120+
 121+
 122+</div>
 123+
 124+<!-- Wikimedia Project logo
 125+<li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
 126+ -->
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/bt/bt-US.html
___________________________________________________________________
Added: svn:eol-style
1127 + native

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r90286Swap else if for elseif...reedy16:26, 17 June 2011
r100671Simplified validation arrays for payments.jpostlethwaite00:34, 25 October 2011
r100837Adding modules directory for GlobalCollect.jpostlethwaite18:39, 26 October 2011
r100950Adding jquery.validate.js to DonationInterface, under GlobalCollect. This wil...jpostlethwaite06:17, 27 October 2011
r101060Enabling javascript for the module: gc.form.core.validatejpostlethwaite21:30, 27 October 2011
r101063Refactored to work with ResourceLoader module: gc.form.core.validate. See r10...jpostlethwaite21:34, 27 October 2011
r101064Added front end debugging to select form payment types to load. Enabled javas...jpostlethwaite21:37, 27 October 2011
r101073Removed placeholder data from form. Now using gateway adapter methods to pull...jpostlethwaite22:25, 27 October 2011
r101076Do not attempt to create an empty dropdown for issuer_id.jpostlethwaite22:42, 27 October 2011
r101335Adding GlobalCollect messages to donationinterface_langonly.phpawjrichards02:17, 31 October 2011
r101553Updated form validation for module.jpostlethwaite23:53, 1 November 2011
r101557Updated GlobalCollect Adapter to include Direct Debit.jpostlethwaite00:03, 2 November 2011
r101561Updated form to handle Direct Debit.jpostlethwaite00:15, 2 November 2011
r101785Lots going on here, in preparation for re-designing the way we validate and a...khorn04:15, 3 November 2011
r101823Added helper methods: getTransactionDataFormAction() and getTransactionDataLa...jpostlethwaite15:44, 3 November 2011
r101826Changed displayResultsForDebug() to not require the $results parameter. This ...jpostlethwaite15:51, 3 November 2011
r101837Fixes up the new addData function in the adapter, to handle things like re-ca...khorn17:39, 3 November 2011
r101870Updated validation to properly handle radio buttons.jpostlethwaite20:20, 3 November 2011
r101871Added comment as to why validation of the state field is ignored.jpostlethwaite20:24, 3 November 2011
r101872Added red color for error messages.jpostlethwaite20:25, 3 November 2011
r101882Added getFormMessagesByType(), getBankTransfer() and getRealTimeBankTransfer().jpostlethwaite21:07, 3 November 2011
r101890making canadian provinces translatablekaldari21:58, 3 November 2011
r101910adding new currencies for sanity check, correcting 2 currency codes, follow-u...kaldari23:06, 3 November 2011
r101947adding separate currency support for different gateways, adding support for p...kaldari02:10, 4 November 2011
r101949Adds another custom filter: One that is based on calling functions back in th...khorn03:02, 4 November 2011
r101950adding french province nameskaldari03:07, 4 November 2011
r101951Adds to GlobalCollect, two new transactions that are meant to fire as the res...khorn03:10, 4 November 2011
r101955Added resultHandler() and resultHandlerError().jpostlethwaite05:14, 4 November 2011
r101956Added $error_map, getErrorMap(), getErrorMapByCodeAndTranslate(), getTransact...jpostlethwaite05:18, 4 November 2011
r101957Added defineErrorMap().jpostlethwaite05:19, 4 November 2011
r101958Added getGoToThankYouOn(). This is a lookup to see which statuses are accepte...jpostlethwaite05:30, 4 November 2011
r101959Added defineErrorMap(), Added new code range. Added defineGoToThankYouOn(). U...jpostlethwaite05:36, 4 November 2011
r101960Removing usage of $result and $data from the view. Enabling bank transfer, re...jpostlethwaite05:41, 4 November 2011
r101964Fixed wrong variable being used for form messages.jpostlethwaite06:57, 4 November 2011
r101965$return variable is only used once. No need to append.jpostlethwaite06:58, 4 November 2011
r101966Fixed wrong variable being used for return.jpostlethwaite06:59, 4 November 2011
r102030Locks down all staged gateway data, and (hopefully) makes the distinction bet...khorn19:37, 4 November 2011
r102032Added more entries for $this->var_map for bank transferjpostlethwaite19:41, 4 November 2011
r102033Added display helper for GlobalCollect bank transfer.jpostlethwaite19:42, 4 November 2011
r102047Establishes constraints on settable fields that should contain the over-archi...khorn21:09, 4 November 2011
r102050Added helpers: getPaymentMethod() and getPaymentSubmethod().jpostlethwaite21:36, 4 November 2011
r102051Added helper: getPaymentSubmethodFormValidation().jpostlethwaite21:37, 4 November 2011
r102052Removing dependency from accessing raw data in GlobalCollectGateway::execute(...jpostlethwaite21:40, 4 November 2011
r102054Added payment_method and payment_submethod as arguments for the Thank you pag...jpostlethwaite21:45, 4 November 2011
r102056Removing AMEX from GC webitects until further noticepgehres22:04, 4 November 2011
r102058Also removing Discover from GC webitects until further noticepgehres22:08, 4 November 2011
r102065an important message from our sponsorskaldari22:51, 4 November 2011
r102081Finishes up the first pass on the new scheme we need to use, for confirming a...khorn01:47, 5 November 2011
r102085Changed public methods to protected.jpostlethwaite04:39, 5 November 2011
r102086Added method: addKeyToTransaction(). This is a helper to modify the transacti...jpostlethwaite04:41, 5 November 2011
r102087Added new information to payment_submethods. Required keys are now designated...jpostlethwaite05:15, 5 November 2011
r102118Localisation updates for core and extension messages from translatewiki.netraymond21:03, 5 November 2011
r102120Fixed Sweden spelling mistake see r100823.jpostlethwaite21:08, 5 November 2011
r102124Added state field to form.jpostlethwaite22:13, 5 November 2011
r102125Requiring state, country and zip on all forms. See r101556.jpostlethwaite22:32, 5 November 2011
r102127changing please enter a state errors to please enter a state/province by adju...jamesur23:04, 5 November 2011
r102134Adds the ability to log out out communication stats, through the regular logg...khorn00:41, 6 November 2011
r102140Prevents anything that isn't a credit card transaction from abusing the Globa...khorn02:00, 6 November 2011
r102147Adding back incorrectly removed cc types for pfp-CApgehres03:11, 6 November 2011
r102151Moved the method addKeyToTransaction() out of parent class. The logic was gat...jpostlethwaite04:15, 6 November 2011
r102152Adding BT form for GlobalCollect. Refactored JS to allow for common include ...pgehres04:21, 6 November 2011
r102155Adding country specific BT forms for US and CA, removing state field from non...pgehres05:12, 6 November 2011
r102156add extra ideal bank and adjust name for SNS Regiojamesur05:26, 6 November 2011
r102186Adds the original transaction response status to the set_payment response, ju...khorn19:55, 6 November 2011
r102188adding currency minimums to webitects js validationkaldari20:01, 6 November 2011

Status & tagging log