r103292 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r103291‎ | r103292 | r103293 >
Date:03:56, 16 November 2011
Author:awjrichards
Status:deferred
Tags:
Comment:
MFT r103289,r103290,r103291
Modified paths:
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-legal.html (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-noheader.html+(from+/trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-noheader.html:1 (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-nolabels.html (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-order.html (modified) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-simpleamount.html+(from+/trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-simpleamoun (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-smallbutton.html+(from+/trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-smallbutton. (added) (history)
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-nolabels.html
——@@ -147,7 +147,6 @@
148148 <input type="hidden" name="returnto" value="Thank_You/en" />
149149 <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
150150 <input type="hidden" value="@amount" name="amount">
151 - <input type="hidden" value="@currency_code" name="currency_code">
152151 <input type="hidden" value="US" name="country" id="country" />
153152 <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
154153 <input type="hidden" value="USD" name="currency_code" />
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3.html
——@@ -128,7 +128,7 @@
129129 <td class="label"></td>
130130 <td>
131131 <div id="mw-donate-submit-button">&nbsp;<br>
132 - <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image">
 132+ <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image"/>
133133 </div>
134134 <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
135135 <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
——@@ -143,7 +143,6 @@
144144 <input type="hidden" name="returnto" value="Thank_You/en" />
145145 <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
146146 <input type="hidden" value="@amount" name="amount">
147 - <input type="hidden" value="@currency_code" name="currency_code">
148147 <input type="hidden" value="US" name="country" id="country" />
149148 <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
150149 <input type="hidden" value="USD" name="currency_code" />
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-legal.html
——@@ -143,7 +143,6 @@
144144 <input type="hidden" name="returnto" value="Thank_You/en" />
145145 <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
146146 <input type="hidden" value="@amount" name="amount">
147 - <input type="hidden" value="@currency_code" name="currency_code">
148147 <input type="hidden" value="US" name="country" id="country" />
149148 <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
150149 <input type="hidden" value="USD" name="currency_code" />
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-smallbutton.html
——@@ -0,0 +1,181 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('pfp.form.rapidhtml.TwoStepTwoColumnLetter3');
 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+
 12+<table width="100%" cellspacing="0" cellpadding="0" border="0">
 13+ <tbody>
 14+ <tr>
 15+ <td id="appeal" valign="top">
 16+ {{LanguageSwitch|2011FR/@appeal/text|@language}}
 17+ </td>
 18+ <td id="donate" valign="top">
 19+ <div id="greenBackground" class="">
 20+ <noscript>
 21+ <div id="noscript">
 22+ <p id="noscript-msg">It appears that you do not have JavaScript enabled, or your browser does not support it. In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
 23+ </div>
 24+ </noscript>
 25+
 26+ <h2 id="donate-head">Please complete your donation below ...</h2>
 27+
 28+ <p id="topError" class="creditcard-error-msg"></p>
 29+
 30+ <form name="payment" method="post" action="@action" autocomplete="off">
 31+ <div id="payflowpro_gateway-personal-info">
 32+ <table id="payflow-table-donor">
 33+ <tbody>
 34+ <tr>
 35+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 36+ </tr>
 37+ <tr>
 38+ <td colspan="2">
 39+ <table cellspacing="0" cellpadding="4" border="1" id="donation_amount">
 40+ <tbody>
 41+ <tr>
 42+ <td class="amount_header">Description</td>
 43+ <td class="amount_header" style="text-align:right;width:75px;">Amount</td>
 44+ <td class="amount_header" style="text-align:right;width:75px;">Currency</td>
 45+ </tr>
 46+ <tr>
 47+ <td class="amount_data">Donation</td>
 48+ <td class="amount_data" style="text-align:right;width:75px;">@amount</td>
 49+ <td class="amount_data" style="text-align:right;width:75px;">@currency_code</td>
 50+ </tr>
 51+ </tbody>
 52+ </table>
 53+ </td>
 54+ </tr>
 55+ <tr>
 56+ <td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
 57+ </tr>
 58+ <tr>
 59+ <td class="label"></td>
 60+ <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
 61+ </tr>
 62+ <tr>
 63+ <td class="label"><label for="card_num">Card number</label></td>
 64+ <td><input name="card_num" size="30" value="@card_num" type="text" maxlength="100" id="card_num" class="fullwidth" autocomplete="off"></td>
 65+ </tr>
 66+ <tr>
 67+ <td class="label"><label for="mos">Expiration date</label></td>
 68+ <td><select name="mos" id="mos"><option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option></select> / <select name="year" id="year">
 69+ <!--<option value="">Year</option>-->
 70+ <option value="2011">2011</option>
 71+ <option value="2012">2012</option>
 72+ <option value="2013">2013</option>
 73+ <option value="2014">2014</option>
 74+ <option value="2015">2015</option>
 75+ <option value="2016">2016</option>
 76+ <option value="2017">2017</option>
 77+ <option value="2018">2018</option>
 78+ <option value="2019">2019</option>
 79+ <option value="2020">2020</option>
 80+ <option value="2021">2021</option>
 81+ </select></td>
 82+ </tr>
 83+ <tr>
 84+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 85+ </tr>
 86+ <tr>
 87+ <td class="label"><label for="cvv">Security code</label></td>
 88+ <td><input name="cvv" size="5" value="@cvv" type="text" maxlength="10" id="cvv" autocomplete="off"> <a href="javascript:PopupCVV();">Where is this?</a></td>
 89+ </tr>
 90+ <tr>
 91+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 92+ </tr>
 93+ <tr>
 94+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 95+ </tr>
 96+ <tr>
 97+ <td class="label"><label for="fname">Name on card</label></td>
 98+ <td><input name="fname" size="30" value="@fname" type="text" placeholder="First name" maxlength="25" class="required" id="fname"><input name="lname" size="30" value="@lname" type="text" placeholder="Last name" maxlength="25" id="lname">
 99+ </td>
 100+ </tr>
 101+ <tr>
 102+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 103+ </tr>
 104+ <tr>
 105+ <td class="label"><label for="street">Billing address</label></td>
 106+ <td><input name="street" size="30" value="@street" type="text" placeholder="Street" maxlength="100" id="street" class="fullwidth"></td>
 107+ </tr>
 108+ <tr>
 109+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 110+ </tr>
 111+ <tr>
 112+ <td class="label"></td>
 113+ <td><input name="city" size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">
 114+ <select id="state" name="state" value="@state" >
 115+ <option value=""></option>
 116+ <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>
 117+ </select>
 118+ <input name="zip" size="5" value="@zip" type="text" placeholder="Zip code" maxlength="10" id="zip">
 119+ </td>
 120+ </tr>
 121+ <tr>
 122+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 123+ </tr>
 124+ <tr>
 125+ <td class="label"><label for="emailAdd">E-mail receipt to</label></td>
 126+ <td><input name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email address" maxlength="64" id="emailAdd" class="fullwidth"></td>
 127+ </tr>
 128+ <tr>
 129+ <td class="label"></td>
 130+ <td>
 131+ <div id="mw-donate-submit-button">&nbsp;<br>
 132+ <input id="ccSubmitButton" name="ccSubmitButton" alt="Submit donation" type="submit" value="Submit donation" style="margin-bottom: 0.6em;"/>
 133+ </div>
 134+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
 135+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
 136+ </div>
 137+ </td>
 138+ </tr>
 139+ </tbody>
 140+ </table>
 141+
 142+ </div>
 143+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 144+ <input type="hidden" name="returnto" value="Thank_You/en" />
 145+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 146+ <input type="hidden" value="@amount" name="amount">
 147+ <input type="hidden" value="US" name="country" id="country" />
 148+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 149+ <input type="hidden" value="USD" name="currency_code" />
 150+ <input type="hidden" value="@utm_source" name="utm_source"/>
 151+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 152+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 153+ <input type="hidden" value="@language" name="language"/>
 154+ <input type="hidden" value="@referrer" name="referrer"/>
 155+ <input type="hidden" value="@comment" name="comment"/>
 156+ <input type="hidden" value="@comment-option" name="comment-option"/>
 157+ <input type="hidden" value="1" name="email-opt"/>
 158+ <input type="hidden" value="@token" name="token"/>
 159+ <input type="hidden" value="@order_id" name="order_id"/>
 160+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 161+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 162+ <input type="hidden" value="@data_hash" name="data_hash"/>
 163+ <input type="hidden" value="@owa_session" name="owa_session"/>
 164+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 165+ <!-- new required fields -->
 166+ <input type="hidden" value="@gateway" name="gateway"/>
 167+ <input type="hidden" value="cc" name="payment_method"/>
 168+ </form>
 169+ <div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info">
 170+ <div id="payflowpro_gateway-donate-addl-info-text">
 171+ <div style="text-align:center;">* * *</div>
 172+ <div class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.</div><div class="">There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.</div>
 173+ <div class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>
 174+ </div>
 175+ </div>
 176+ </div>
 177+ <div style="clear:both;"></div>
 178+ </div>
 179+ </td>
 180+ </tr>
 181+ </tbody>
 182+</table>
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-noheader.html
——@@ -0,0 +1,181 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('pfp.form.rapidhtml.TwoStepTwoColumnLetter3');
 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+
 12+<table width="100%" cellspacing="0" cellpadding="0" border="0">
 13+ <tbody>
 14+ <tr>
 15+ <td id="appeal" valign="top">
 16+ {{LanguageSwitch|2011FR/@appeal/text|@language}}
 17+ </td>
 18+ <td id="donate" valign="top">
 19+ <div id="greenBackground" class="">
 20+ <noscript>
 21+ <div id="noscript">
 22+ <p id="noscript-msg">It appears that you do not have JavaScript enabled, or your browser does not support it. In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
 23+ </div>
 24+ </noscript>
 25+
 26+ <!--<h2 id="donate-head">Please complete your donation below ...</h2>-->
 27+
 28+ <p id="topError" class="creditcard-error-msg"></p>
 29+
 30+ <form name="payment" method="post" action="@action" autocomplete="off">
 31+ <div id="payflowpro_gateway-personal-info">
 32+ <table id="payflow-table-donor">
 33+ <tbody>
 34+ <tr>
 35+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 36+ </tr>
 37+ <tr>
 38+ <td colspan="2">
 39+ <table cellspacing="0" cellpadding="4" border="1" id="donation_amount">
 40+ <tbody>
 41+ <tr>
 42+ <td class="amount_header">Description</td>
 43+ <td class="amount_header" style="text-align:right;width:75px;">Amount</td>
 44+ <td class="amount_header" style="text-align:right;width:75px;">Currency</td>
 45+ </tr>
 46+ <tr>
 47+ <td class="amount_data">Donation</td>
 48+ <td class="amount_data" style="text-align:right;width:75px;">@amount</td>
 49+ <td class="amount_data" style="text-align:right;width:75px;">@currency_code</td>
 50+ </tr>
 51+ </tbody>
 52+ </table>
 53+ </td>
 54+ </tr>
 55+ <tr>
 56+ <td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
 57+ </tr>
 58+ <tr>
 59+ <td class="label"></td>
 60+ <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
 61+ </tr>
 62+ <tr>
 63+ <td class="label"><label for="card_num">Card number</label></td>
 64+ <td><input name="card_num" size="30" value="@card_num" type="text" maxlength="100" id="card_num" class="fullwidth" autocomplete="off"></td>
 65+ </tr>
 66+ <tr>
 67+ <td class="label"><label for="mos">Expiration date</label></td>
 68+ <td><select name="mos" id="mos"><option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option></select> / <select name="year" id="year">
 69+ <!--<option value="">Year</option>-->
 70+ <option value="2011">2011</option>
 71+ <option value="2012">2012</option>
 72+ <option value="2013">2013</option>
 73+ <option value="2014">2014</option>
 74+ <option value="2015">2015</option>
 75+ <option value="2016">2016</option>
 76+ <option value="2017">2017</option>
 77+ <option value="2018">2018</option>
 78+ <option value="2019">2019</option>
 79+ <option value="2020">2020</option>
 80+ <option value="2021">2021</option>
 81+ </select></td>
 82+ </tr>
 83+ <tr>
 84+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 85+ </tr>
 86+ <tr>
 87+ <td class="label"><label for="cvv">Security code</label></td>
 88+ <td><input name="cvv" size="5" value="@cvv" type="text" maxlength="10" id="cvv" autocomplete="off"> <a href="javascript:PopupCVV();">Where is this?</a></td>
 89+ </tr>
 90+ <tr>
 91+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 92+ </tr>
 93+ <tr>
 94+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 95+ </tr>
 96+ <tr>
 97+ <td class="label"><label for="fname">Name on card</label></td>
 98+ <td><input name="fname" size="30" value="@fname" type="text" placeholder="First name" maxlength="25" class="required" id="fname"><input name="lname" size="30" value="@lname" type="text" placeholder="Last name" maxlength="25" id="lname">
 99+ </td>
 100+ </tr>
 101+ <tr>
 102+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 103+ </tr>
 104+ <tr>
 105+ <td class="label"><label for="street">Billing address</label></td>
 106+ <td><input name="street" size="30" value="@street" type="text" placeholder="Street" maxlength="100" id="street" class="fullwidth"></td>
 107+ </tr>
 108+ <tr>
 109+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 110+ </tr>
 111+ <tr>
 112+ <td class="label"></td>
 113+ <td><input name="city" size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">
 114+ <select id="state" name="state" value="@state" >
 115+ <option value=""></option>
 116+ <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>
 117+ </select>
 118+ <input name="zip" size="5" value="@zip" type="text" placeholder="Zip code" maxlength="10" id="zip">
 119+ </td>
 120+ </tr>
 121+ <tr>
 122+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 123+ </tr>
 124+ <tr>
 125+ <td class="label"><label for="emailAdd">E-mail receipt to</label></td>
 126+ <td><input name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email address" maxlength="64" id="emailAdd" class="fullwidth"></td>
 127+ </tr>
 128+ <tr>
 129+ <td class="label"></td>
 130+ <td>
 131+ <div id="mw-donate-submit-button">&nbsp;<br>
 132+ <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image">
 133+ </div>
 134+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
 135+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
 136+ </div>
 137+ </td>
 138+ </tr>
 139+ </tbody>
 140+ </table>
 141+
 142+ </div>
 143+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 144+ <input type="hidden" name="returnto" value="Thank_You/en" />
 145+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 146+ <input type="hidden" value="@amount" name="amount">
 147+ <input type="hidden" value="US" name="country" id="country" />
 148+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 149+ <input type="hidden" value="USD" name="currency_code" />
 150+ <input type="hidden" value="@utm_source" name="utm_source"/>
 151+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 152+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 153+ <input type="hidden" value="@language" name="language"/>
 154+ <input type="hidden" value="@referrer" name="referrer"/>
 155+ <input type="hidden" value="@comment" name="comment"/>
 156+ <input type="hidden" value="@comment-option" name="comment-option"/>
 157+ <input type="hidden" value="1" name="email-opt"/>
 158+ <input type="hidden" value="@token" name="token"/>
 159+ <input type="hidden" value="@order_id" name="order_id"/>
 160+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 161+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 162+ <input type="hidden" value="@data_hash" name="data_hash"/>
 163+ <input type="hidden" value="@owa_session" name="owa_session"/>
 164+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 165+ <!-- new required fields -->
 166+ <input type="hidden" value="@gateway" name="gateway"/>
 167+ <input type="hidden" value="cc" name="payment_method"/>
 168+ </form>
 169+ <div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info">
 170+ <div id="payflowpro_gateway-donate-addl-info-text">
 171+ <div style="text-align:center;">* * *</div>
 172+ <div class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.</div><div class="">There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.</div>
 173+ <div class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>
 174+ </div>
 175+ </div>
 176+ </div>
 177+ <div style="clear:both;"></div>
 178+ </div>
 179+ </td>
 180+ </tr>
 181+ </tbody>
 182+</table>
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-order.html
——@@ -143,7 +143,6 @@
144144 <input type="hidden" name="returnto" value="Thank_You/en" />
145145 <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
146146 <input type="hidden" value="@amount" name="amount">
147 - <input type="hidden" value="@currency_code" name="currency_code">
148147 <input type="hidden" value="US" name="country" id="country" />
149148 <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
150149 <input type="hidden" value="USD" name="currency_code" />
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/html/TwoStepTwoColumnLetter3-simpleamount.html
——@@ -0,0 +1,167 @@
 2+<script type="text/javascript">
 3+ mw.loader.load('pfp.form.rapidhtml.TwoStepTwoColumnLetter3');
 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+
 12+<table width="100%" cellspacing="0" cellpadding="0" border="0">
 13+ <tbody>
 14+ <tr>
 15+ <td id="appeal" valign="top">
 16+ {{LanguageSwitch|2011FR/@appeal/text|@language}}
 17+ </td>
 18+ <td id="donate" valign="top">
 19+ <div id="greenBackground" class="">
 20+ <noscript>
 21+ <div id="noscript">
 22+ <p id="noscript-msg">It appears that you do not have JavaScript enabled, or your browser does not support it. In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.</p><p id="noscript-redirect-msg">If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:</p><p id="noscript-redirect-link"><a href="http://wikimediafoundation.org/wiki/DonateNonJS/en">http://wikimediafoundation.org/wiki/DonateNonJS/en</a></p>
 23+ </div>
 24+ </noscript>
 25+
 26+ <!--<h2 id="donate-head">Please complete your donation below ...</h2>-->
 27+
 28+ <p id="topError" class="creditcard-error-msg"></p>
 29+
 30+ <form name="payment" method="post" action="@action" autocomplete="off">
 31+ <div id="payflowpro_gateway-personal-info">
 32+ <table id="payflow-table-donor">
 33+ <tbody>
 34+ <tr>
 35+ <td colspan="2">
 36+ <div id="step1header">
 37+ <h3 class="amount_header">Donation amount&#160;&#160;<span id="selected-amount">$@amount</span></h3>
 38+ </div>
 39+ </td>
 40+ </tr>
 41+ <tr>
 42+ <td colspan="2"><h3 class="cc_header">Billing information<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td>
 43+ </tr>
 44+ <tr>
 45+ <td class="label"></td>
 46+ <td><img src="@script_path/extensions/DonationInterface/gateway_forms/includes/credit_card_logos.gif"></td>
 47+ </tr>
 48+ <tr>
 49+ <td class="label"><label for="card_num">Card number</label></td>
 50+ <td><input name="card_num" size="30" value="@card_num" type="text" maxlength="100" id="card_num" class="fullwidth" autocomplete="off"></td>
 51+ </tr>
 52+ <tr>
 53+ <td class="label"><label for="mos">Expiration date</label></td>
 54+ <td><select name="mos" id="mos"><option value="01">1 (January)</option><option value="02">2 (February)</option><option value="03">3 (March)</option><option value="04">4 (April)</option><option value="05">5 (May)</option><option value="06">6 (June)</option><option value="07">7 (July)</option><option value="08">8 (August)</option><option value="09">9 (September)</option><option value="10">10 (October)</option><option value="11">11 (November)</option><option value="12">12 (December)</option></select> / <select name="year" id="year">
 55+ <!--<option value="">Year</option>-->
 56+ <option value="2011">2011</option>
 57+ <option value="2012">2012</option>
 58+ <option value="2013">2013</option>
 59+ <option value="2014">2014</option>
 60+ <option value="2015">2015</option>
 61+ <option value="2016">2016</option>
 62+ <option value="2017">2017</option>
 63+ <option value="2018">2018</option>
 64+ <option value="2019">2019</option>
 65+ <option value="2020">2020</option>
 66+ <option value="2021">2021</option>
 67+ </select></td>
 68+ </tr>
 69+ <tr>
 70+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 71+ </tr>
 72+ <tr>
 73+ <td class="label"><label for="cvv">Security code</label></td>
 74+ <td><input name="cvv" size="5" value="@cvv" type="text" maxlength="10" id="cvv" autocomplete="off"> <a href="javascript:PopupCVV();">Where is this?</a></td>
 75+ </tr>
 76+ <tr>
 77+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 78+ </tr>
 79+ <tr>
 80+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 81+ </tr>
 82+ <tr>
 83+ <td class="label"><label for="fname">Name on card</label></td>
 84+ <td><input name="fname" size="30" value="@fname" type="text" placeholder="First name" maxlength="25" class="required" id="fname"><input name="lname" size="30" value="@lname" type="text" placeholder="Last name" maxlength="25" id="lname">
 85+ </td>
 86+ </tr>
 87+ <tr>
 88+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 89+ </tr>
 90+ <tr>
 91+ <td class="label"><label for="street">Billing address</label></td>
 92+ <td><input name="street" size="30" value="@street" type="text" placeholder="Street" maxlength="100" id="street" class="fullwidth"></td>
 93+ </tr>
 94+ <tr>
 95+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 96+ </tr>
 97+ <tr>
 98+ <td class="label"></td>
 99+ <td><input name="city" size="18" value="@city" type="text" placeholder="City" maxlength="40" id="city">
 100+ <select id="state" name="state" value="@state" >
 101+ <option value=""></option>
 102+ <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>
 103+ </select>
 104+ <input name="zip" size="5" value="@zip" type="text" placeholder="Zip code" maxlength="10" id="zip">
 105+ </td>
 106+ </tr>
 107+ <tr>
 108+ <td colspan="2"><span class="creditcard-error-msg"></span></td>
 109+ </tr>
 110+ <tr>
 111+ <td class="label"><label for="emailAdd">E-mail receipt to</label></td>
 112+ <td><input name="emailAdd" size="30" value="@emailAdd" type="text" placeholder="Email address" maxlength="64" id="emailAdd" class="fullwidth"></td>
 113+ </tr>
 114+ <tr>
 115+ <td class="label"></td>
 116+ <td>
 117+ <div id="mw-donate-submit-button">&nbsp;<br>
 118+ <input id="ccSubmitButton" name="ccSubmitButton" src="@script_path/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png" alt="Submit donation" type="image">
 119+ </div>
 120+ <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage">
 121+ <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">Your credit / debit card will be securely processed.
 122+ </div>
 123+ </td>
 124+ </tr>
 125+ </tbody>
 126+ </table>
 127+
 128+ </div>
 129+ <input type="hidden" name="gateway" value="payflowpro" id="gateway" />
 130+ <input type="hidden" name="returnto" value="Thank_You/en" />
 131+ <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect">
 132+ <input type="hidden" value="@amount" name="amount">
 133+ <input type="hidden" value="US" name="country" id="country" />
 134+ <input type="hidden" value="@expiration" name="expiration" id="expiration"/>
 135+ <input type="hidden" value="USD" name="currency_code" />
 136+ <input type="hidden" value="@utm_source" name="utm_source"/>
 137+ <input type="hidden" value="@utm_medium" name="utm_medium"/>
 138+ <input type="hidden" value="@utm_campaign" name="utm_campaign"/>
 139+ <input type="hidden" value="@language" name="language"/>
 140+ <input type="hidden" value="@referrer" name="referrer"/>
 141+ <input type="hidden" value="@comment" name="comment"/>
 142+ <input type="hidden" value="@comment-option" name="comment-option"/>
 143+ <input type="hidden" value="1" name="email-opt"/>
 144+ <input type="hidden" value="@token" name="token"/>
 145+ <input type="hidden" value="@order_id" name="order_id"/>
 146+ <input type="hidden" value="@numAttempt" name="numAttempt"/>
 147+ <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/>
 148+ <input type="hidden" value="@data_hash" name="data_hash"/>
 149+ <input type="hidden" value="@owa_session" name="owa_session"/>
 150+ <input type="hidden" value="@owa_ref" name="owa_ref"/>
 151+ <!-- new required fields -->
 152+ <input type="hidden" value="@gateway" name="gateway"/>
 153+ <input type="hidden" value="cc" name="payment_method"/>
 154+ </form>
 155+ <div class="payflow-cc-form-section" id="payflowpro_gateway-donate-addl-info">
 156+ <div id="payflowpro_gateway-donate-addl-info-text">
 157+ <div style="text-align:center;">* * *</div>
 158+ <div class="">We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.</div><div class="">There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.</div>
 159+ <div class="">Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>
 160+ </div>
 161+ </div>
 162+ </div>
 163+ <div style="clear:both;"></div>
 164+ </div>
 165+ </td>
 166+ </tr>
 167+ </tbody>
 168+</table>
Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css
——@@ -166,4 +166,9 @@
167167 ul#moreinfolinks li{
168168 list-style: none !important;
169169 list-style-image: none !important;
170 -}
\ No newline at end of file
 170+}
 171+h3.amount_header {
 172+ padding: 0 0 0.4em 0;
 173+ margin-bottom: 0;
 174+ font-weight: normal;
 175+}
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms
___________________________________________________________________
Modified: svn:mergeinfo
171176 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/forms:r103289-103291
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway
___________________________________________________________________
Modified: svn:mergeinfo
172177 Merged /trunk/extensions/DonationInterface/payflowpro_gateway:r103289-103291
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
173178 Merged /trunk/extensions/DonationInterface:r103289-103291

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r103289new forms for new testskaldari02:57, 16 November 2011
r103290new form for new small button testkaldari03:24, 16 November 2011
r103291removing duplicate currency_codekaldari03:28, 16 November 2011

Status & tagging log