| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php |
| — | — | @@ -131,7 +131,22 @@ |
| 132 | 132 | 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 133 | 133 | 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| 134 | 134 | ); |
| | 135 | +$wgResourceModules[ 'gc.form.rapidhtml.cc' ] = array( |
| | 136 | + 'styles' => 'css/gc.cc.css', |
| | 137 | + 'scripts' => array( |
| | 138 | + 'js/gc.js', |
| | 139 | + 'js/gc.cc.js' |
| | 140 | + ), |
| | 141 | + 'dependencies' => array( 'di.form.core.validate' ), |
| | 142 | + 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| | 143 | + 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| | 144 | +); |
| 135 | 145 | |
| | 146 | + |
| | 147 | +/************************************************************* |
| | 148 | + ************************************************************* |
| | 149 | + *************************************************************/ |
| | 150 | + |
| 136 | 151 | // PayflowPro |
| 137 | 152 | $wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array( |
| 138 | 153 | 'styles' => '', |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/wmlogo_blue.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/wmlogo_blue.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 139 | 154 | + image/png |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/wmlogo_white.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/includes/wmlogo_white.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 140 | 155 | + image/png |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php |
| — | — | @@ -856,15 +856,6 @@ |
| 857 | 857 | 'keys' => array(), |
| 858 | 858 | ); |
| 859 | 859 | |
| 860 | | - // eWallets PayPal |
| 861 | | - $this->payment_submethods['ew_paypal'] = array( |
| 862 | | - 'paymentproductid' => 840, |
| 863 | | - 'label' => 'eWallets: PayPal', |
| 864 | | - 'group' => 'ew', |
| 865 | | - 'validation' => array(), |
| 866 | | - 'keys' => array(), |
| 867 | | - ); |
| 868 | | - |
| 869 | 860 | // eWallets WebMoney |
| 870 | 861 | $this->payment_submethods['ew_webmoney'] = array( |
| 871 | 862 | 'paymentproductid' => 841, |
| — | — | @@ -1277,8 +1268,6 @@ |
| 1278 | 1269 | } |
| 1279 | 1270 | |
| 1280 | 1271 | $errors[ $code ] = ( $this->getGlobal( 'DisplayDebug' ) ) ? '*** ' . $message : $this->getErrorMapByCodeAndTranslate( $code ); |
| 1281 | | - |
| 1282 | | - $this->setTransactionWMFStatus( $this->findCodeAction( 'GET_ORDERSTATUS', 'STATUSID', $code ) ); |
| 1283 | 1272 | } |
| 1284 | 1273 | return $errors; |
| 1285 | 1274 | } |
| — | — | @@ -1298,13 +1287,13 @@ |
| 1299 | 1288 | $transaction = $this->getCurrentTransaction(); |
| 1300 | 1289 | |
| 1301 | 1290 | $this->getTransactionStatus(); |
| 1302 | | - |
| | 1291 | + |
| 1303 | 1292 | switch ( $transaction ) { |
| 1304 | 1293 | case 'INSERT_ORDERWITHPAYMENT': |
| 1305 | 1294 | $data = $this->xmlChildrenToArray( $response, 'ROW' ); |
| 1306 | 1295 | $data['ORDER'] = $this->xmlChildrenToArray( $response, 'ORDER' ); |
| 1307 | 1296 | $data['PAYMENT'] = $this->xmlChildrenToArray( $response, 'PAYMENT' ); |
| 1308 | | - |
| | 1297 | + |
| 1309 | 1298 | // WMFStatus will already be set if the transaction was unable to communicate properly. |
| 1310 | 1299 | if ( $this->getTransactionStatus() ) { |
| 1311 | 1300 | $this->setTransactionWMFStatus( $this->findCodeAction( 'GET_ORDERSTATUS', 'STATUSID', $data['STATUSID'] ) ); |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1312 | 1301 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php:r103842,103845,103854,103960,103963,103971,103983 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/modules/validate_input.js |
| — | — | @@ -56,7 +56,13 @@ |
| 57 | 57 | error = ( amount == null || isNaN( amount ) || amount.value <= 0 ); |
| 58 | 58 | |
| 59 | 59 | // Check amount is at least the minimum |
| 60 | | - var currency_code = $( 'input[name="currency_code"]' ).val(); |
| | 60 | + var currency_code = ''; |
| | 61 | + if( $( 'input[name="currency_code"]' ).length ){ |
| | 62 | + currency_code = $( 'input[name="currency_code"]' ).val(); |
| | 63 | + } |
| | 64 | + if( $( 'select[name="currency_code"]' ).length ){ |
| | 65 | + currency_code = $( 'select[name="currency_code"]' ).val(); |
| | 66 | + } |
| 61 | 67 | if ( typeof( wgCurrencyMinimums[currency_code] ) == 'undefined' ) { |
| 62 | 68 | wgCurrencyMinimums[currency_code] = 1; |
| 63 | 69 | } |