| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-US.html |
| — | — | @@ -0,0 +1,139 @@ |
| | 2 | +<script type="text/javascript"> |
| | 3 | + mw.loader.load('gc.form.rapidhtml.cc'); |
| | 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">%donate_interface-noscript-msg%</p> |
| | 23 | + <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p> |
| | 24 | + <p id="noscript-redirect-link"><a href="https://www.mediawiki.org//wikimediafoundation.org/wiki/DonateNonJS/en">wikimediafoundation.org/wiki/DonateNonJS/en</a></p> |
| | 25 | + </div> |
| | 26 | + </noscript> |
| | 27 | + <p id="topError" class="creditcard-error-msg"></p> |
| | 28 | + |
| | 29 | + <form name="payment" method="post" action="@action"> |
| | 30 | + <div id="payflowpro_gateway-personal-info"> |
| | 31 | + <table id="payflow-table-donor"> |
| | 32 | + <tbody> |
| | 33 | + <tr> |
| | 34 | + <td colspan="2"> |
| | 35 | + <div id="step1header"> |
| | 36 | + <h3 class="amount_header">Monthly donation amount: <span id="selected-amount">$@amount</span></h3> |
| | 37 | + </div> |
| | 38 | + </td> |
| | 39 | + </tr> |
| | 40 | + <tr> |
| | 41 | + <td colspan="2"><h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td> |
| | 42 | + </tr> |
| | 43 | + <tr> |
| | 44 | + <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="First name" id="fname"><input name="lname" value="@lname" type="text" placeholder="Last name" id="lname"></td> |
| | 45 | + </tr> |
| | 46 | + <tr> |
| | 47 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 48 | + </tr> |
| | 49 | + <tr> |
| | 50 | + <td colspan="2"><input name="street" value="@street" type="text" placeholder="Street" id="street"></td> |
| | 51 | + </tr> |
| | 52 | + <tr> |
| | 53 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 54 | + </tr> |
| | 55 | + <tr> |
| | 56 | + <td colspan="2"><input name="city" value="@city" type="text" placeholder="City" id="city"> |
| | 57 | + <select id="state" name="state" value="@state" > |
| | 58 | + <option value=""></option> |
| | 59 | + <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> |
| | 60 | + </select> |
| | 61 | + <input name="zip" value="@zip" type="text" placeholder="Zip code" id="zip"> |
| | 62 | + </td> |
| | 63 | + </tr> |
| | 64 | + <tr> |
| | 65 | + <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="Email address" id="emailAdd"></td> |
| | 66 | + </tr> |
| | 67 | + <tr> |
| | 68 | + <td> |
| | 69 | + <dl class=""> |
| | 70 | + <dd class="field" style="margin-bottom: 0; margin-left: 0;"> |
| | 71 | + <ul class="options-h" id="cards" style="margin: 0;"> |
| | 72 | + <li><input id="cc-visa" name="cardtype" type="radio" value="visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li> |
| | 73 | + <li><input id="cc-mastercard" name="cardtype" type="radio" value="mastercard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li> |
| | 74 | + <li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li> |
| | 75 | + <li><input id="cc-discover" name="cardtype" type="radio" value="discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li> |
| | 76 | + </ul> |
| | 77 | + <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div> |
| | 78 | + </dd> |
| | 79 | + </dl> |
| | 80 | + </td> |
| | 81 | + </tr> |
| | 82 | + <tr> |
| | 83 | + <td> |
| | 84 | + <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div> |
| | 85 | + </td> |
| | 86 | + </tr> |
| | 87 | + <tr> |
| | 88 | + <td> |
| | 89 | + <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"> |
| | 90 | + <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">%donate_interface-donate-click% |
| | 91 | + </div> |
| | 92 | + </td> |
| | 93 | + </tr> |
| | 94 | + </tbody> |
| | 95 | + </table> |
| | 96 | + </div> |
| | 97 | + <input type="hidden" name="gateway" value="payflowpro" id="gateway" /> |
| | 98 | + <input type="hidden" name="returnto" value="Thank_You/en" /> |
| | 99 | + <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect"> |
| | 100 | + <input type="hidden" value="@amount" name="amount"> |
| | 101 | + <input type="hidden" value="US" name="country" id="country" /> |
| | 102 | + <input type="hidden" value="@expiration" name="expiration" id="expiration"/> |
| | 103 | + <input type="hidden" value="USD" name="currency_code" /> |
| | 104 | + <input type="hidden" value="@utm_source" name="utm_source"/> |
| | 105 | + <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| | 106 | + <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| | 107 | + <input type="hidden" value="@language" name="language"/> |
| | 108 | + <input type="hidden" value="@referrer" name="referrer"/> |
| | 109 | + <input type="hidden" value="@comment" name="comment"/> |
| | 110 | + <input type="hidden" value="@comment-option" name="comment-option"/> |
| | 111 | + <input type="hidden" value="1" name="email-opt"/> |
| | 112 | + <input type="hidden" value="@token" name="token"/> |
| | 113 | + <input type="hidden" value="@order_id" name="order_id"/> |
| | 114 | + <input type="hidden" value="@numAttempt" name="numAttempt"/> |
| | 115 | + <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/> |
| | 116 | + <input type="hidden" value="@data_hash" name="data_hash"/> |
| | 117 | + <input type="hidden" value="@owa_session" name="owa_session"/> |
| | 118 | + <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| | 119 | + <input type="hidden" value="@gateway" name="gateway"/> |
| | 120 | + <input type="hidden" value="cc" name="payment_method"/> |
| | 121 | + </form> |
| | 122 | + </div> |
| | 123 | + <p id="informationsharing">%donate_interface-informationsharing|url%</p> |
| | 124 | + <table> |
| | 125 | + <tr> |
| | 126 | + <td> |
| | 127 | + <ul id="moreinfolinks"> |
| | 128 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li> |
| | 129 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li> |
| | 130 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li> |
| | 131 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li> |
| | 132 | + </ul> |
| | 133 | + </td> |
| | 134 | + <td>@verisign_logo</td> |
| | 135 | + </tr> |
| | 136 | + </table> |
| | 137 | + </td> |
| | 138 | + </tr> |
| | 139 | + </tbody> |
| | 140 | +</table> |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-US.html |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 141 | + native |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-CA.html |
| — | — | @@ -0,0 +1,148 @@ |
| | 2 | +<script type="text/javascript"> |
| | 3 | + mw.loader.load('gc.form.rapidhtml.cc'); |
| | 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">%donate_interface-noscript-msg%</p> |
| | 23 | + <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p> |
| | 24 | + <p id="noscript-redirect-link"><a href="https://www.mediawiki.org//wikimediafoundation.org/wiki/DonateNonJS/en">wikimediafoundation.org/wiki/DonateNonJS/en</a></p> |
| | 25 | + </div> |
| | 26 | + </noscript> |
| | 27 | + <p id="topError" class="creditcard-error-msg"></p> |
| | 28 | + |
| | 29 | + <form name="payment" method="post" action="@action"> |
| | 30 | + <div id="payflowpro_gateway-personal-info"> |
| | 31 | + <table id="payflow-table-donor"> |
| | 32 | + <tbody> |
| | 33 | + <tr> |
| | 34 | + <td colspan="2"> |
| | 35 | + <div id="step1header"> |
| | 36 | + <h3 class="amount_header">Monthly donation amount: <span id="selected-amount">$@amount (CAD)</span></h3> |
| | 37 | + </div> |
| | 38 | + </td> |
| | 39 | + </tr> |
| | 40 | + <tr> |
| | 41 | + <td colspan="2"><h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td> |
| | 42 | + </tr> |
| | 43 | + <tr> |
| | 44 | + <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-lname%" id="fname"><input name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname"></td> |
| | 45 | + </tr> |
| | 46 | + <tr> |
| | 47 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 48 | + </tr> |
| | 49 | + <tr> |
| | 50 | + <td colspan="2"><input name="street" value="@street" type="text" placeholder="%donate_interface-donor-street%" id="street"></td> |
| | 51 | + </tr> |
| | 52 | + <tr> |
| | 53 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 54 | + </tr> |
| | 55 | + <tr> |
| | 56 | + <td colspan="2"><input name="city" value="@city" type="text" placeholder="%donate_interface-donor-city%" id="city"> |
| | 57 | + <select id="state" name="state" class="txt" value="@state" > |
| | 58 | + <option value=""></option> |
| | 59 | + <option value="AB">AB</option> |
| | 60 | + <option value="BC">BC</option> |
| | 61 | + <option value="MB">MB</option> |
| | 62 | + <option value="NB">NB</option> |
| | 63 | + <option value="NL">NL</option> |
| | 64 | + <option value="NS">NS</option> |
| | 65 | + <option value="ON">ON</option> |
| | 66 | + <option value="PE">PE</option> |
| | 67 | + <option value="QC">QC</option> |
| | 68 | + <option value="SK">SK</option> |
| | 69 | + </select> |
| | 70 | + <input name="zip" value="@zip" type="text" placeholder="%donate_interface-donor-postal%" id="zip"> |
| | 71 | + </td> |
| | 72 | + </tr> |
| | 73 | + <tr> |
| | 74 | + <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="%donate_interface-donor-email%" id="emailAdd"></td> |
| | 75 | + </tr> |
| | 76 | + <tr> |
| | 77 | + <td> |
| | 78 | + <dl class=""> |
| | 79 | + <dd class="field" style="margin-bottom: 0; margin-left: 0;"> |
| | 80 | + <ul class="options-h" id="cards" style="margin: 0;"> |
| | 81 | + <li><input id="cc-visa" name="cardtype" type="radio" value="visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li> |
| | 82 | + <li><input id="cc-mastercard" name="cardtype" type="radio" value="mastercard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li> |
| | 83 | + <!--<li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li>--> |
| | 84 | + <!--<li><input id="cc-discover" name="cardtype" type="radio" value="discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>--> |
| | 85 | + </ul> |
| | 86 | + <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div> |
| | 87 | + </dd> |
| | 88 | + </dl> |
| | 89 | + </td> |
| | 90 | + </tr> |
| | 91 | + <tr> |
| | 92 | + <td> |
| | 93 | + <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div> |
| | 94 | + </td> |
| | 95 | + </tr> |
| | 96 | + <tr> |
| | 97 | + <td> |
| | 98 | + <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"> |
| | 99 | + <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">%donate_interface-donate-click% |
| | 100 | + </div> |
| | 101 | + </td> |
| | 102 | + </tr> |
| | 103 | + </tbody> |
| | 104 | + </table> |
| | 105 | + </div> |
| | 106 | + <input type="hidden" name="gateway" value="payflowpro" id="gateway" /> |
| | 107 | + <input type="hidden" name="returnto" value="Thank_You/en" /> |
| | 108 | + <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect"> |
| | 109 | + <input type="hidden" value="@amount" name="amount"> |
| | 110 | + <input type="hidden" value="CA" name="country" id="country" /> |
| | 111 | + <input type="hidden" value="@expiration" name="expiration" id="expiration"/> |
| | 112 | + <input type="hidden" value="CAD" name="currency_code" /> |
| | 113 | + <input type="hidden" value="@utm_source" name="utm_source"/> |
| | 114 | + <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| | 115 | + <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| | 116 | + <input type="hidden" value="@language" name="language"/> |
| | 117 | + <input type="hidden" value="@referrer" name="referrer"/> |
| | 118 | + <input type="hidden" value="@comment" name="comment"/> |
| | 119 | + <input type="hidden" value="@comment-option" name="comment-option"/> |
| | 120 | + <input type="hidden" value="1" name="email-opt"/> |
| | 121 | + <input type="hidden" value="@token" name="token"/> |
| | 122 | + <input type="hidden" value="@order_id" name="order_id"/> |
| | 123 | + <input type="hidden" value="@numAttempt" name="numAttempt"/> |
| | 124 | + <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/> |
| | 125 | + <input type="hidden" value="@data_hash" name="data_hash"/> |
| | 126 | + <input type="hidden" value="@owa_session" name="owa_session"/> |
| | 127 | + <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| | 128 | + <input type="hidden" value="@gateway" name="gateway"/> |
| | 129 | + <input type="hidden" value="cc" name="payment_method"/> |
| | 130 | + </form> |
| | 131 | + </div> |
| | 132 | + <p id="informationsharing">%donate_interface-informationsharing|url%</p> |
| | 133 | + <table> |
| | 134 | + <tr> |
| | 135 | + <td> |
| | 136 | + <ul id="moreinfolinks"> |
| | 137 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li> |
| | 138 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li> |
| | 139 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li> |
| | 140 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li> |
| | 141 | + </ul> |
| | 142 | + </td> |
| | 143 | + <td>@verisign_logo</td> |
| | 144 | + </tr> |
| | 145 | + </table> |
| | 146 | + </td> |
| | 147 | + </tr> |
| | 148 | + </tbody> |
| | 149 | +</table> |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-CA.html |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 150 | + native |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-AU.html |
| — | — | @@ -0,0 +1,148 @@ |
| | 2 | +<script type="text/javascript"> |
| | 3 | + mw.loader.load('gc.form.rapidhtml.cc'); |
| | 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">%donate_interface-noscript-msg%</p> |
| | 23 | + <p id="noscript-redirect-msg">%donate_interface-noscript-redirect-msg%</p> |
| | 24 | + <p id="noscript-redirect-link"><a href="https://www.mediawiki.org//wikimediafoundation.org/wiki/DonateNonJS/en">wikimediafoundation.org/wiki/DonateNonJS/en</a></p> |
| | 25 | + </div> |
| | 26 | + </noscript> |
| | 27 | + <p id="topError" class="creditcard-error-msg"></p> |
| | 28 | + |
| | 29 | + <form name="payment" method="post" action="@action"> |
| | 30 | + <div id="payflowpro_gateway-personal-info"> |
| | 31 | + <table id="payflow-table-donor"> |
| | 32 | + <tbody> |
| | 33 | + <tr> |
| | 34 | + <td colspan="2"> |
| | 35 | + <div id="step1header"> |
| | 36 | + <h3 class="amount_header">Monthly donation amount: <span id="selected-amount">$@amount (AUD)</span></h3> |
| | 37 | + </div> |
| | 38 | + </td> |
| | 39 | + </tr> |
| | 40 | + <tr> |
| | 41 | + <td colspan="2"><h3 class="cc_header">%donate_interface-cc-form-header-personal%<img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-left:8px;"></h3></td> |
| | 42 | + </tr> |
| | 43 | + <tr> |
| | 44 | + <td colspan="2"><input name="fname" value="@fname" type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input name="lname" value="@lname" type="text" placeholder="%donate_interface-donor-lname%" id="lname"></td> |
| | 45 | + </tr> |
| | 46 | + <tr> |
| | 47 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 48 | + </tr> |
| | 49 | + <tr> |
| | 50 | + <td colspan="2"><input name="street" value="@street" type="text" placeholder="%donate_interface-donor-street%" id="street"></td> |
| | 51 | + </tr> |
| | 52 | + <tr> |
| | 53 | + <td colspan="2"><span class="creditcard-error-msg"></span></td> |
| | 54 | + </tr> |
| | 55 | + <tr> |
| | 56 | + <!-- TODO: add "locality" to translation (probably part of a "neighborhood" type thing--> |
| | 57 | + <td colspan="2"><input name="city" value="@city" type="text" placeholder="Locality" id="city"> |
| | 58 | + <select id="state" name="state" class="txt" value="@state" > |
| | 59 | + <option value="">%donate_interface-donor-state%</option> |
| | 60 | + <option value="ACT">ACT</option> |
| | 61 | + <option value="NSW">NSW</option> |
| | 62 | + <option value="NT">NT</option> |
| | 63 | + <option value="QLD">QLD</option> |
| | 64 | + <option value="SA">SA</option> |
| | 65 | + <option value="TAS">TAS</option> |
| | 66 | + <option value="VIC">VIC</option> |
| | 67 | + <option value="WA">WA</option> |
| | 68 | + </select> |
| | 69 | + <input name="zip" value="@zip" type="text" placeholder="%donate_interface-donor-postal%" id="zip"> |
| | 70 | + </td> |
| | 71 | + </tr> |
| | 72 | + <tr> |
| | 73 | + <td colspan="2"><input name="emailAdd" value="@emailAdd" type="text" placeholder="%donate_interface-donor-email%" id="emailAdd"></td> |
| | 74 | + </tr> |
| | 75 | + <tr> |
| | 76 | + <td> |
| | 77 | + <dl class=""> |
| | 78 | + <dd class="field" style="margin-bottom: 0; margin-left: 0;"> |
| | 79 | + <ul class="options-h" id="cards" style="margin: 0;"> |
| | 80 | + <li><input id="cc-visa" name="cardtype" type="radio" value="visa" class="cardradio" /> <label for="cc-visa"><img alt="Visa" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-visa.png" /></label></li> |
| | 81 | + <li><input id="cc-mastercard" name="cardtype" type="radio" value="mastercard" class="cardradio" /> <label for="cc-mastercard"><img alt="MasterCard" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" /></label></li> |
| | 82 | + <li><input id="cc-amex" name="cardtype" type="radio" value="american" class="cardradio" /> <label for="cc-amex"><img alt="American Express" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-amex.png" /></label></li> |
| | 83 | + <!--<li><input id="cc-discover" name="cardtype" type="radio" value="discover" class="cardradio" /> <label for="cc-discover"><img alt="Discover" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-discover.png" /></label></li>--> |
| | 84 | + <li><input id="cc-jcb" name="cardtype" type="radio" value="jcb" class="cardradio" /> <label for="cc-jcb"><img alt="JCB" src="@script_path/extensions/DonationInterface/gateway_forms/includes/card-jcb.png" /></label></li> |
| | 85 | + </ul> |
| | 86 | + <div id="paymentContinue" style="margin-top: 10px; display: none;"> <input class="btn" id="paymentContinueBtn" type="button" value="%donate_interface-continue%" /></div> |
| | 87 | + </dd> |
| | 88 | + </dl> |
| | 89 | + </td> |
| | 90 | + </tr> |
| | 91 | + <tr> |
| | 92 | + <td> |
| | 93 | + <div id="payment" class="gainlayout" style="height:0px;text-align:center;"></div> |
| | 94 | + </td> |
| | 95 | + </tr> |
| | 96 | + <tr> |
| | 97 | + <td> |
| | 98 | + <div class="mw-donate-submessage" id="payflowpro_gateway-donate-submessage"> |
| | 99 | + <img src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif" style="vertical-align:baseline;margin-right:4px;">%donate_interface-donate-click% |
| | 100 | + </div> |
| | 101 | + </td> |
| | 102 | + </tr> |
| | 103 | + </tbody> |
| | 104 | + </table> |
| | 105 | + </div> |
| | 106 | + <input type="hidden" name="gateway" value="payflowpro" id="gateway" /> |
| | 107 | + <input type="hidden" name="returnto" value="Thank_You/en" /> |
| | 108 | + <input type="hidden" value="0" name="PaypalRedirect" id="PaypalRedirect"> |
| | 109 | + <input type="hidden" value="@amount" name="amount"> |
| | 110 | + <input type="hidden" value="AU" name="country" id="country" /> |
| | 111 | + <input type="hidden" value="@expiration" name="expiration" id="expiration"/> |
| | 112 | + <input type="hidden" value="AUD" name="currency_code" /> |
| | 113 | + <input type="hidden" value="@utm_source" name="utm_source"/> |
| | 114 | + <input type="hidden" value="@utm_medium" name="utm_medium"/> |
| | 115 | + <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
| | 116 | + <input type="hidden" value="@language" name="language"/> |
| | 117 | + <input type="hidden" value="@referrer" name="referrer"/> |
| | 118 | + <input type="hidden" value="@comment" name="comment"/> |
| | 119 | + <input type="hidden" value="@comment-option" name="comment-option"/> |
| | 120 | + <input type="hidden" value="1" name="email-opt"/> |
| | 121 | + <input type="hidden" value="@token" name="token"/> |
| | 122 | + <input type="hidden" value="@order_id" name="order_id"/> |
| | 123 | + <input type="hidden" value="@numAttempt" name="numAttempt"/> |
| | 124 | + <input type="hidden" value="@contribution_tracking_id" name="contribution_tracking_id"/> |
| | 125 | + <input type="hidden" value="@data_hash" name="data_hash"/> |
| | 126 | + <input type="hidden" value="@owa_session" name="owa_session"/> |
| | 127 | + <input type="hidden" value="@owa_ref" name="owa_ref"/> |
| | 128 | + <input type="hidden" value="@gateway" name="gateway"/> |
| | 129 | + <input type="hidden" value="cc" name="payment_method"/> |
| | 130 | + </form> |
| | 131 | + </div> |
| | 132 | + <p id="informationsharing">%donate_interface-informationsharing|url%</p> |
| | 133 | + <table> |
| | 134 | + <tr> |
| | 135 | + <td> |
| | 136 | + <ul id="moreinfolinks"> |
| | 137 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Monthly_donations&language=@language&uselang=@language&country=@country">%donate_interface-monthly-donation%</a></li> |
| | 138 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country">%donate_interface-otherways-short%</a></li> |
| | 139 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=FAQ&language=@language&uselang=@language&country=@country">%donate_interface-faqs%</a></li> |
| | 140 | + <li><a href="http://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Tax_Deductibility&language=@language&uselang=@language&country=@country">%donate_interface-tax-info%</a></li> |
| | 141 | + </ul> |
| | 142 | + </td> |
| | 143 | + <td>@verisign_logo</td> |
| | 144 | + </tr> |
| | 145 | + </table> |
| | 146 | + </td> |
| | 147 | + </tr> |
| | 148 | + </tbody> |
| | 149 | +</table> |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html/rcc/rcc-AU.html |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 150 | + native |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/html |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 151 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/forms/html:r105584,105593-105594,105600,105611 |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 152 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/forms:r105584,105593-105594,105600,105611 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/scripts/orphans.php |
| — | — | @@ -1,12 +1,15 @@ |
| 2 | 2 | <?php |
| | 3 | +//actually, as a maintenance script, this totally is a valid entry point. |
| | 4 | + |
| 3 | 5 | //If you want to use this script, you will have to add the following line to LocalSettings.php: |
| 4 | 6 | //$wgAutoloadClasses['GlobalCollectOrphanAdapter'] = $IP . '/extensions/DonationInterface/globalcollect_gateway/scripts/orphan_adapter.php'; |
| 5 | 7 | |
| 6 | | -//TODO: Something that is not specific to anybody's install, here. |
| 7 | | -global $IP; |
| 8 | | -if ( !isset($IP) ) { |
| 9 | | - $IP = '../../../../'; |
| | 8 | +$IP = getenv( 'MW_INSTALL_PATH' ); |
| | 9 | +if ( $IP === false ) { |
| | 10 | + $IP = dirname( _FILE_ ) . '/../..'; |
| 10 | 11 | } |
| | 12 | + |
| | 13 | +//If you get errors on this next line, set (and export) your MW_INSTALL_PATH var. |
| 11 | 14 | require_once( "$IP/maintenance/Maintenance.php" ); |
| 12 | 15 | |
| 13 | 16 | class GlobalCollectOrphanRectifier extends Maintenance { |
| — | — | @@ -17,7 +20,6 @@ |
| 18 | 21 | protected $target_execute_time = 30; //(seconds) - only used by the stomp option. |
| 19 | 22 | protected $adapter; |
| 20 | 23 | |
| 21 | | - |
| 22 | 24 | function execute(){ |
| 23 | 25 | $func = 'parse_files'; |
| 24 | 26 | if ( !empty( $_SERVER['argv'][1] ) ){ |
| — | — | @@ -46,7 +48,7 @@ |
| 47 | 49 | } |
| 48 | 50 | |
| 49 | 51 | function orphan_stomp(){ |
| 50 | | - |
| | 52 | + echo "Orphan Stomp\n"; |
| 51 | 53 | $this->removed_message_count = 0; |
| 52 | 54 | $this->now = time(); //time at start, thanks very much. |
| 53 | 55 | |
| — | — | @@ -96,8 +98,17 @@ |
| 97 | 99 | break; |
| 98 | 100 | } |
| 99 | 101 | } |
| 100 | | - echo "\nDone! Final results: \n $am destroyed via antimessage \n $rec rectified orphans \n $err errored out\n"; |
| | 102 | + $final = "\nDone! Final results: \n"; |
| | 103 | + $final .= " $am destroyed via antimessage \n"; |
| | 104 | + $final .= " $rec rectified orphans \n"; |
| | 105 | + $final .= " $err errored out \n"; |
| | 106 | + if ( isset( $this->adapter->orphanstats ) ){ |
| | 107 | + foreach ( $this->adapter->orphanstats as $status => $count ) { |
| | 108 | + $final .= " Status $status = $count\n"; |
| | 109 | + } |
| | 110 | + } |
| 101 | 111 | |
| | 112 | + echo $final; |
| 102 | 113 | } |
| 103 | 114 | |
| 104 | 115 | function keepGoing(){ |
| — | — | @@ -115,20 +126,19 @@ |
| 116 | 127 | if ( $correlation_id ) { |
| 117 | 128 | $bucket[$correlation_id] = "'$correlation_id'"; //avoiding duplicates. |
| 118 | 129 | $this->handled_ids[$correlation_id] = 'antimessage'; |
| 119 | | - echo "Added $correlation_id to the ack bucket : Total bucket count = " . count( $bucket ); |
| 120 | 130 | } |
| 121 | 131 | if ( count( $bucket ) && ( count( $bucket ) >= $count || $ackNow ) ){ |
| 122 | 132 | //ack now. |
| 123 | | - echo 'Acking ' . count( $bucket ) . ' bucket messages.'; |
| | 133 | + echo 'Acking ' . count( $bucket ) . " bucket messages.\n"; |
| 124 | 134 | $selector = 'JMSCorrelationID IN (' . implode( ", ", $bucket ) . ')'; |
| 125 | 135 | $ackMe = stompFetchMessages( 'cc-limbo', $selector, $count * 100 ); //This is outrageously high, but I just want to be reasonably sure we get all the matches. |
| 126 | 136 | $retrieved_count = count( $ackMe ); |
| 127 | 137 | if ( $retrieved_count ){ |
| 128 | 138 | stompAckMessages( $ackMe ); |
| 129 | 139 | $this->removed_message_count += $retrieved_count; |
| 130 | | - echo "Done acking $retrieved_count messages. "; |
| | 140 | + echo "Done acking $retrieved_count messages. \n"; |
| 131 | 141 | } else { |
| 132 | | - echo "Oh noes! No messages to ack for some reason..."; |
| | 142 | + echo "Oh noes! No messages retrieved for $selector...\n"; |
| 133 | 143 | } |
| 134 | 144 | $bucket = array(); |
| 135 | 145 | } |
| — | — | @@ -146,7 +156,7 @@ |
| 147 | 157 | if (array_key_exists('correlation-id', $message->headers)) { |
| 148 | 158 | $this->addStompCorrelationIDToAckBucket( $message->headers['correlation-id'] ); |
| 149 | 159 | } else { |
| 150 | | - echo 'The STOMP message ' . $message->headers['message-id'] . ' has no correlation ID!'; |
| | 160 | + echo 'The STOMP message ' . $message->headers['message-id'] . " has no correlation ID!\n"; |
| 151 | 161 | } |
| 152 | 162 | } |
| 153 | 163 | $antimessages = stompFetchMessages( 'cc-limbo', $selector, 1000 ); |
| — | — | @@ -178,8 +188,10 @@ |
| 179 | 189 | $order_id = $order_id[1]; |
| 180 | 190 | $decoded['order_id'] = $order_id; |
| 181 | 191 | $decoded['i_order_id'] = $order_id; |
| | 192 | + $decoded = unCreateQueueMessage($decoded); |
| | 193 | + $decoded['card_num'] = ''; |
| 182 | 194 | $orphans[$correlation_id] = $decoded; |
| 183 | | - echo "\nFound an orphan! $correlation_id"; |
| | 195 | + echo "Found an orphan! $correlation_id \n"; |
| 184 | 196 | } |
| 185 | 197 | } |
| 186 | 198 | } |
| — | — | @@ -197,7 +209,7 @@ |
| 198 | 210 | $this->order_ids[$id] = $id; //easier to unset this way. |
| 199 | 211 | } |
| 200 | 212 | $outstanding_count = count( $this->order_ids ); |
| 201 | | - echo "Order ID count: " . $outstanding_count . "\n"; |
| | 213 | + echo "Order ID count: $outstanding_count \n"; |
| 202 | 214 | |
| 203 | 215 | $files = $this->getAllLogFileNames(); |
| 204 | 216 | $payments = array(); |
| — | — | @@ -274,7 +286,7 @@ |
| 275 | 287 | * @return boolean True if the orphan has been rectified, false if not. |
| 276 | 288 | */ |
| 277 | 289 | function rectifyOrphan( $data, $query_contribution_tracking = true ){ |
| 278 | | - echo "\nRectifying Orphan " . $data['order_id']; |
| | 290 | + echo 'Rectifying Orphan ' . $data['order_id'] . "\n"; |
| 279 | 291 | $rectified = false; |
| 280 | 292 | |
| 281 | 293 | $this->adapter->loadDataAndReInit( $data, $query_contribution_tracking ); |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/scripts/orphans.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 282 | 294 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/scripts/orphans.php:r105534,105584,105593-105594,105600,105611 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/scripts/orphan_adapter.php |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | $msg .= "$key = $val "; |
| 158 | 158 | } |
| 159 | 159 | $this->log( "$ctid: Found UTM Data. $msg" ); |
| 160 | | - echo $msg; |
| | 160 | + echo "$msg\n"; |
| 161 | 161 | return $data; |
| 162 | 162 | } |
| 163 | 163 | } |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/scripts/orphan_adapter.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 164 | 164 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/scripts/orphan_adapter.php:r105611 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php |
| — | — | @@ -1104,8 +1104,9 @@ |
| 1105 | 1105 | } |
| 1106 | 1106 | } |
| 1107 | 1107 | } |
| 1108 | | - |
| | 1108 | + $gotCVV = false; |
| 1109 | 1109 | if ( count( $addme ) ){ |
| | 1110 | + $gotCVV = true; |
| 1110 | 1111 | $this->addData( $addme ); |
| 1111 | 1112 | $this->staged_data['order_id'] = $this->staged_data['i_order_id']; |
| 1112 | 1113 | $logmsg = $this->getData_Raw( 'contribution_tracking_id' ) . ': '; |
| — | — | @@ -1114,10 +1115,7 @@ |
| 1115 | 1116 | self::log( $logmsg ); |
| 1116 | 1117 | $this->runPreProcessHooks(); |
| 1117 | 1118 | $status_result['action'] = $this->getValidationAction(); |
| 1118 | | - } else { |
| 1119 | | - $problemflag = true; //nothing to be done. |
| 1120 | | - $problemmessage = "Unable to retrieve orphan cvv/avs results (Communication problem?)."; |
| 1121 | | - } |
| | 1119 | + } |
| 1122 | 1120 | } |
| 1123 | 1121 | |
| 1124 | 1122 | //we filtered |
| — | — | @@ -1133,6 +1131,20 @@ |
| 1134 | 1132 | $order_status_results = $this->getTransactionWMFStatus(); |
| 1135 | 1133 | $txn_data = $this->getTransactionData(); |
| 1136 | 1134 | $original_status_code = isset( $txn_data['STATUSID']) ? $txn_data['STATUSID'] : 'NOT SET'; |
| | 1135 | + if ( $is_orphan ){ |
| | 1136 | + //save stats. |
| | 1137 | + if (!isset($this->orphanstats) || !isset( $this->orphanstats[$original_status_code] ) ){ |
| | 1138 | + $this->orphanstats[$original_status_code] = 0; |
| | 1139 | + } else { |
| | 1140 | + $this->orphanstats[$original_status_code] += 1; |
| | 1141 | + } |
| | 1142 | + |
| | 1143 | + if ( $original_status_code > 70 && !$gotCVV ){ |
| | 1144 | + $problemflag = true; |
| | 1145 | + $problemmessage = "Unable to retrieve orphan cvv/avs results (Communication problem?)."; |
| | 1146 | + } |
| | 1147 | + |
| | 1148 | + } |
| 1137 | 1149 | if (!$order_status_results){ |
| 1138 | 1150 | $problemflag = true; |
| 1139 | 1151 | $problemmessage = "We don't have a Transaction WMF Status after doing a GET_ORDERSTATUS."; |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1140 | 1152 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php:r105611 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php |
| — | — | @@ -207,6 +207,7 @@ |
| 208 | 208 | In some instances, the code is located on the left side of the card, but is always above the account number.</p><br />', |
| 209 | 209 | 'donate_interface-question-comment' => 'Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>', |
| 210 | 210 | 'donate_interface-easydonate' => 'We are trying to make it easy for people in every country to donate. Please let us know how we could make it easier for you. Send your suggestions to: problemsdonating@wikimedia.org.', |
| | 211 | + 'donate_interface-problemsdonating' => 'Problems donating?', |
| 211 | 212 | 'donate_interface-donate-click' => 'Your credit card will be securely processed.', |
| 212 | 213 | 'donate_interface-otherways' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give, including PayPal, check, or mail</a>.', |
| 213 | 214 | 'donate_interface-otherways-alt' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.', |
| — | — | @@ -650,6 +651,7 @@ |
| 651 | 652 | 'donate_interface-cvv-explain' => 'Explanation of what CVV is.', |
| 652 | 653 | 'donate_interface-question-comment' => 'Final message telling people to contact WMF if they have questions.', |
| 653 | 654 | 'donate_interface-easydonate' => '[[meta:Fundraising_2011/Core_messages/en]]', |
| | 655 | + 'donate_interface-problemsdonating' => 'Link text, link pointing to page with troubleshooting.', |
| 654 | 656 | 'donate_interface-donate-click' => 'Message assuring people WMF will not misuse information.', |
| 655 | 657 | 'donate_interface-otherways' => 'Message informing people about other ways to give. Shown below donate form.', |
| 656 | 658 | 'donate_interface-otherways-alt' => 'Message informing people about other ways to donate. Shown below donation form.', |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 657 | 659 | Merged /trunk/extensions/DonationInterface/gateway_common/interface.i18n.php:r105600,105611 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/activemq_stomp/activemq_stomp.php |
| — | — | @@ -188,7 +188,7 @@ |
| 189 | 189 | */ |
| 190 | 190 | function createQueueMessage( $transaction ) { |
| 191 | 191 | // specifically designed to match the CiviCRM API that will handle it |
| 192 | | - // edit this array to include/ignore transaction data sent to the server |
| | 192 | + // edit this array to include/ignore transaction data sent to the server |
| 193 | 193 | $message = array( |
| 194 | 194 | 'contribution_tracking_id' => $transaction['contribution_tracking_id'], |
| 195 | 195 | 'optout' => $transaction['optout'], |
| — | — | @@ -236,6 +236,42 @@ |
| 237 | 237 | return $message; |
| 238 | 238 | } |
| 239 | 239 | |
| | 240 | + |
| | 241 | +function unCreateQueueMessage( $transaction ) { |
| | 242 | + // For now, this function assumes that we have a complete queue message. |
| | 243 | + // TODO: Something more robust and programmatic, as time allows. This whole file is just terrible. |
| | 244 | + |
| | 245 | + $rekey = array( |
| | 246 | + 'first_name' => 'fname', |
| | 247 | + 'middle_name' => 'mname', |
| | 248 | + 'last_name' => 'lname', |
| | 249 | + 'street_address' => 'street', |
| | 250 | + 'state_province' => 'state', |
| | 251 | + 'postal_code' => 'zip', |
| | 252 | + 'first_name_2' => 'fname2', |
| | 253 | + 'last_name_2' => 'lname2', |
| | 254 | + 'street_address_2' => 'street2', |
| | 255 | + 'city_2' => 'city2', |
| | 256 | + 'state_province_2' => 'state2', |
| | 257 | + 'postal_code_2' => 'zip2', |
| | 258 | +// 'currency' => 'currency_code', |
| | 259 | + 'original_currency' => 'currency_code', |
| | 260 | + 'original_gross' => 'amount', |
| | 261 | +// 'gross' => 'amount', |
| | 262 | +// 'net' => 'amount', |
| | 263 | + ); |
| | 264 | + |
| | 265 | + foreach ( $rekey as $stomp => $di ){ |
| | 266 | + if ( isset( $transaction[$stomp] ) ){ |
| | 267 | + $transaction[$di] = $transaction[$stomp]; |
| | 268 | + unset($transaction[$stomp]); |
| | 269 | + }; |
| | 270 | + } |
| | 271 | + |
| | 272 | + return $transaction; |
| | 273 | +} |
| | 274 | + |
| | 275 | + |
| 240 | 276 | /** |
| 241 | 277 | * Fetches all the messages in a queue that match the supplies selector. |
| 242 | 278 | * Limiting to a completely arbitrary 50, just in case something goes amiss somewhere. |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/activemq_stomp/activemq_stomp.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 243 | 279 | Merged /trunk/extensions/DonationInterface/activemq_stomp/activemq_stomp.php:r105611 |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 244 | 280 | Merged /trunk/extensions/DonationInterface:r104539,105534,105584,105593-105594,105600,105611 |