Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/html/lightbox1.html |
— | — | @@ -108,7 +108,7 @@ |
109 | 109 | <input type="hidden" value="@amount" name="amount" /> |
110 | 110 | <input type="hidden" value="@country" name="country" id="country" /> |
111 | 111 | <input type="hidden" value="@expiration" name="expiration" /> |
112 | | - <input type="hidden" value="@currency_code" name="currency" /> |
| 112 | + <input type="hidden" value="@currency_code" name="currency_code" /> |
113 | 113 | <input type="hidden" value="@utm_source" name="utm_source"/> |
114 | 114 | <input type="hidden" value="@utm_medium" name="utm_medium"/> |
115 | 115 | <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/js/lightbox1.js |
— | — | @@ -153,7 +153,7 @@ |
154 | 154 | var sendData = { |
155 | 155 | 'action': 'donate', |
156 | 156 | 'gateway': 'payflowpro', |
157 | | - 'currency': 'USD', |
| 157 | + 'currency_code': 'USD', |
158 | 158 | 'amount': $( "input[name='amount']" ).val(), |
159 | 159 | 'fname': $( "input[name='fname']" ).val(), |
160 | 160 | 'lname': $( "input[name='lname']" ).val(), |
— | — | @@ -234,7 +234,7 @@ |
235 | 235 | error = ( amount == null || isNaN( amount ) || amount.value <= 0 ); |
236 | 236 | // Check amount is at least the minimum |
237 | 237 | var currency = 'USD'; // hard-coded for these forms and tests |
238 | | - $( "input[name='currency']" ).val( currency ); |
| 238 | + $( "input[name='currency_code']" ).val( currency ); |
239 | 239 | if ( typeof( wgCurrencyMinimums[currency] ) == 'undefined' ) { |
240 | 240 | wgCurrencyMinimums[currency] = 1; |
241 | 241 | } |
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/lightbox1.html |
— | — | @@ -108,7 +108,7 @@ |
109 | 109 | <input type="hidden" value="@amount" name="amount" /> |
110 | 110 | <input type="hidden" value="@country" name="country" id="country" /> |
111 | 111 | <input type="hidden" value="@expiration" name="expiration" /> |
112 | | - <input type="hidden" value="@currency_code" name="currency" /> |
| 112 | + <input type="hidden" value="@currency_code" name="currency_code" /> |
113 | 113 | <input type="hidden" value="@utm_source" name="utm_source"/> |
114 | 114 | <input type="hidden" value="@utm_medium" name="utm_medium"/> |
115 | 115 | <input type="hidden" value="@utm_campaign" name="utm_campaign"/> |
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js |
— | — | @@ -11,11 +11,11 @@ |
12 | 12 | } |
13 | 13 | |
14 | 14 | var currencyField = document.getElementById( 'input_currency_code' ); |
15 | | - var currency = ''; |
| 15 | + var currency_code = ''; |
16 | 16 | if ( currencyField && currencyField.type == 'select-one' ) { // currency is a dropdown select |
17 | | - currency = $( 'select#input_currency_code option:selected' ).val(); |
| 17 | + currency_code = $( 'select#input_currency_code option:selected' ).val(); |
18 | 18 | } else { |
19 | | - currency = $( "input[name='currency_code']" ).val(); |
| 19 | + currency_code = $( "input[name='currency_code']" ).val(); |
20 | 20 | } |
21 | 21 | |
22 | 22 | var stateField = document.getElementById( 'state' ); |
— | — | @@ -37,7 +37,7 @@ |
38 | 38 | var sendData = { |
39 | 39 | 'action': 'donate', |
40 | 40 | 'gateway': 'globalcollect', |
41 | | - 'currency': currency, |
| 41 | + 'currency_code': currency_code, |
42 | 42 | 'amount': $( "input[name='amount']" ).val(), |
43 | 43 | 'fname': $( "input[name='fname']" ).val(), |
44 | 44 | 'lname': $( "input[name='lname']" ).val(), |
Index: trunk/extensions/DonationInterface/gateway_common/donation.api.php |
— | — | @@ -89,7 +89,7 @@ |
90 | 90 | 'gateway' => $this->defineParam( true ), |
91 | 91 | 'test' => $this->defineParam( false ), |
92 | 92 | 'amount' => $this->defineParam( false ), |
93 | | - 'currency' => $this->defineParam( false ), |
| 93 | + 'currency_code' => $this->defineParam( false ), |
94 | 94 | 'fname' => $this->defineParam( false ), |
95 | 95 | 'mname' => $this->defineParam( false ), |
96 | 96 | 'lname' => $this->defineParam( false ), |
— | — | @@ -128,7 +128,7 @@ |
129 | 129 | $this->donationData = array( |
130 | 130 | 'gateway' => $this->gateway, |
131 | 131 | 'amount' => "35", |
132 | | - 'currency' => 'USD', |
| 132 | + 'currency_code' => 'USD', |
133 | 133 | 'fname' => 'Tester', |
134 | 134 | 'mname' => 'T.', |
135 | 135 | 'lname' => 'Testington', |
— | — | @@ -157,7 +157,7 @@ |
158 | 158 | 'gateway' => 'Which payment gateway to use - payflowpro, globalcollect, etc.', |
159 | 159 | 'test' => 'Set to true if you want to use bogus test data instead of supplying your own', |
160 | 160 | 'amount' => 'The amount donated', |
161 | | - 'currency' => 'Currency code', |
| 161 | + 'currency_code' => 'Currency code', |
162 | 162 | 'fname' => 'First name', |
163 | 163 | 'mname' => 'Middle name', |
164 | 164 | 'lname' => 'Last name', |
— | — | @@ -192,7 +192,7 @@ |
193 | 193 | |
194 | 194 | public function getExamples() { |
195 | 195 | return array( |
196 | | - 'api.php?action=donate&gateway=payflowpro&amount=2.00¤cy=USD', |
| 196 | + 'api.php?action=donate&gateway=payflowpro&amount=2.00¤cy_code=USD', |
197 | 197 | ); |
198 | 198 | } |
199 | 199 | |