| Index: trunk/extensions/DonationInterface/extras/custom_filters/filters/source/source.body.php |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | foreach ( $wgCustomFiltersSrcRules as $regex => $risk_score_modifier ) { |
| 30 | 30 | /** |
| 31 | 31 | * Note that regex pattern does not include delimiters. |
| 32 | | - * These will need to be included your custom regex patterns. |
| | 32 | + * These will need to be included in your custom regex patterns. |
| 33 | 33 | */ |
| 34 | 34 | if ( preg_match( "$regex", $source ) ) { |
| 35 | 35 | $this->cfo->risk_score += $risk_score_modifier; |
| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/Webitects.css |
| — | — | @@ -37,11 +37,14 @@ |
| 38 | 38 | /* Specifics |
| 39 | 39 | ======================================================================*/ |
| 40 | 40 | /* Buttons */ |
| 41 | | -.btn { display: inline-block; padding: 0.3em 0.5em; vertical-align: middle; } |
| | 41 | +.btn { display: inline-block; padding: 0.3em 0.5em; vertical-align: middle; font-size: 12px; } |
| 42 | 42 | |
| 43 | 43 | /* Donate options */ |
| 44 | 44 | .donate-options input { width: 15em; } |
| 45 | 45 | |
| | 46 | +/* Continue button */ |
| | 47 | +#paymentContinue input { width: 15em; } |
| | 48 | + |
| 46 | 49 | /* Checklists */ |
| 47 | 50 | .checklist { border: 1px solid #ccc; max-height: 20em; line-height: 1.4; margin: 0 0 1em 0; overflow: auto; } |
| 48 | 51 | .checklist input { margin-bottom: 1px; } |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects_2_3step.js |
| — | — | @@ -161,7 +161,6 @@ |
| 162 | 162 | 'card_type': $( "input[name='cardtype']" ).val().toLowerCase(), |
| 163 | 163 | 'format': 'json' |
| 164 | 164 | }; |
| 165 | | - |
| 166 | 165 | $.ajax( { |
| 167 | 166 | 'url': mw.util.wikiScript( 'api' ), |
| 168 | 167 | 'data': sendData, |
| — | — | @@ -201,6 +200,9 @@ |
| 202 | 201 | } |
| 203 | 202 | |
| 204 | 203 | function showStep2() { |
| | 204 | + if ( $( '#step3wrapper' ).is(":visible") ) { |
| | 205 | + $( "#paymentContinue" ).show(); // Show continue button in 2nd section |
| | 206 | + } |
| 205 | 207 | // show the correct sections |
| 206 | 208 | $( "#step1wrapper" ).slideUp(); |
| 207 | 209 | $( "#step2wrapper" ).slideDown(); |
| Index: trunk/extensions/DonationInterface/gateway_common/donation.api.php |
| — | — | @@ -60,6 +60,9 @@ |
| 61 | 61 | if ( array_key_exists( 'RESPMSG', $result['data'] ) ) { |
| 62 | 62 | $outputResult['responsemsg'] = $result['data']['RESPMSG']; |
| 63 | 63 | } |
| | 64 | + if ( array_key_exists( 'ORDERID', $result['data'] ) ) { |
| | 65 | + $outputResult['orderid'] = $result['data']['ORDERID']; |
| | 66 | + } |
| 64 | 67 | } |
| 65 | 68 | if ( $result['errors'] ) { |
| 66 | 69 | $outputResult['errors'] = $result['errors']; |
| — | — | @@ -69,7 +72,7 @@ |
| 70 | 73 | $this->getResult()->addValue( null, 'request', $this->donationData ); |
| 71 | 74 | } |
| 72 | 75 | $this->getResult()->addValue( null, 'result', $outputResult ); |
| 73 | | - |
| | 76 | + |
| 74 | 77 | /* |
| 75 | 78 | $this->getResult()->setIndexedTagName( $result, 'response' ); |
| 76 | 79 | $this->getResult()->addValue( 'data', 'result', $result ); |
| — | — | @@ -97,6 +100,7 @@ |
| 98 | 101 | 'cvv' => $this->defineParam( false ), |
| 99 | 102 | 'payment_method' => $this->defineParam( false ), |
| 100 | 103 | 'language' => $this->defineParam( false ), |
| | 104 | + 'order_id' => $this->defineParam( false ), |
| 101 | 105 | ); |
| 102 | 106 | } |
| 103 | 107 | |
| — | — | @@ -158,6 +162,7 @@ |
| 159 | 163 | 'cvv' => 'CVV security code', |
| 160 | 164 | 'payment_method' => 'Payment method to use', |
| 161 | 165 | 'language' => 'Language code', |
| | 166 | + 'order_id' => 'Order ID (if a donation has already been started)', |
| 162 | 167 | ); |
| 163 | 168 | } |
| 164 | 169 | |