| Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php |
| — | — | @@ -65,7 +65,10 @@ |
| 66 | 66 | // GlobalCollect |
| 67 | 67 | $wgResourceModules[ 'gc.form.rapidhtml.webitects' ] = array( |
| 68 | 68 | 'styles' => '', |
| 69 | | - 'scripts' => 'js/webitects.js', |
| | 69 | + 'scripts' => array( |
| | 70 | + 'js/webitects.js', |
| | 71 | + 'js/webitects.accordian.js', |
| | 72 | + ), |
| 70 | 73 | 'dependencies' => 'di.form.rapidhtml.webitects', |
| 71 | 74 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 72 | 75 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| — | — | @@ -109,8 +112,11 @@ |
| 110 | 113 | ); |
| 111 | 114 | $wgResourceModules[ 'gc.form.rapidhtml.webitects.bt' ] = array( |
| 112 | 115 | 'styles' => '', |
| 113 | | - 'scripts' => 'js/webitects.bt.js', |
| 114 | | - 'dependencies' => 'gc.form.rapidhtml.webitects.2nd', |
| | 116 | +// 'scripts' => 'js/webitects.bt.js', |
| | 117 | + 'dependencies' => array( |
| | 118 | + 'gc.form.rapidhtml.webitects.2nd', |
| | 119 | + 'gc.form.core.validate' |
| | 120 | + ), |
| 115 | 121 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 116 | 122 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| 117 | 123 | ); |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects2nd.js |
| — | — | @@ -48,6 +48,14 @@ |
| 49 | 49 | displayCreditCardForm() |
| 50 | 50 | } |
| 51 | 51 | } ); |
| | 52 | + |
| | 53 | + $( "#bt-continueBtn" ).live( "click", function() { |
| | 54 | + if ( validateAmount() && validate_personal( document.paypalcontribution ) ) { |
| | 55 | + document.paypalcontribution.action = actionURL; |
| | 56 | + document.paypalcontribution.submit(); |
| | 57 | + } |
| | 58 | + } ); |
| | 59 | + |
| 52 | 60 | // Set the cards to progress to step 3 |
| 53 | 61 | $( ".cardradio" ).live( "click", function() { |
| 54 | 62 | if ( validate_personal( document.paypalcontribution ) && validateAmount() ) { |