| Index: branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php |
| — | — | @@ -63,6 +63,7 @@ |
| 64 | 64 | 'payflowpro_gateway-error-msg-state' => 'state', |
| 65 | 65 | 'payflowpro_gateway-error-msg-zip' => 'postal code', |
| 66 | 66 | 'payflowpro_gateway-error-msg-country' => 'country', |
| | 67 | + 'payflowpro_gateway-error-msg-card_type' => 'credit card type', |
| 67 | 68 | 'payflowpro_gateway-error-msg-card_num' => 'credit card number', |
| 68 | 69 | 'payflowpro_gateway-error-msg-expiration' => "card's expiration date", |
| 69 | 70 | 'payflowpro_gateway-error-msg-cvv' => 'CVV from the back of your card', |
| Index: branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php |
| — | — | @@ -70,6 +70,7 @@ |
| 71 | 71 | 'payflowproGatewayErrorMsgState' => wfMsg( 'payflowpro_gateway-error-msg-state' ), |
| 72 | 72 | 'payflowproGatewayErrorMsgZip' => wfMsg( 'payflowpro_gateway-error-msg-zip' ), |
| 73 | 73 | 'payflowproGatewayErrorMsgCountry' => wfMsg( 'payflowpro_gateway-error-msg-country' ), |
| | 74 | + 'payflowproGatewayErrorMsgCardType' => wfMsg( 'payflowpro_gateway-error-msg-card_type' ), |
| 74 | 75 | 'payflowproGatewayErrorMsgCardNum' => wfMsg( 'payflowpro_gateway-error-msg-card_num' ), |
| 75 | 76 | 'payflowproGatewayErrorMsgExpiration' => wfMsg( 'payflowpro_gateway-error-msg-expiration' ), |
| 76 | 77 | 'payflowproGatewayErrorMsgCvv' => wfMsg( 'payflowpro_gateway-error-msg-cvv' ), |
| — | — | @@ -966,7 +967,7 @@ |
| 967 | 968 | 'size' => 'small', |
| 968 | 969 | 'premium_language' => 'es', |
| 969 | 970 | 'card_num' => $card_nums[ $cards[ $card_index ]][ $card_num_index ], |
| 970 | | - 'card' => $cards[ $card_index ], |
| | 971 | + 'card_type' => $cards[ $card_index ], |
| 971 | 972 | 'expiration' => date( 'my', strtotime( '+1 year 1 month' ) ), |
| 972 | 973 | 'cvv' => '001', |
| 973 | 974 | 'currency' => 'USD', |
| — | — | @@ -1019,7 +1020,7 @@ |
| 1020 | 1021 | 'size' => $wgRequest->getText( 'size' ), |
| 1021 | 1022 | 'premium_language' => $wgRequest->getText( 'premium_language', "en" ), |
| 1022 | 1023 | 'card_num' => str_replace( ' ', '', $wgRequest->getText( 'card_num' ) ), |
| 1023 | | - 'card' => $wgRequest->getText( 'card' ), |
| | 1024 | + 'card_type' => $wgRequest->getText( 'card_type' ), |
| 1024 | 1025 | 'expiration' => $wgRequest->getText( 'mos' ) . substr( $wgRequest->getText( 'year' ), 2, 2 ), |
| 1025 | 1026 | 'cvv' => $wgRequest->getText( 'cvv' ), |
| 1026 | 1027 | 'currency' => $wgRequest->getText( 'currency_code' ), |
| — | — | @@ -1073,7 +1074,7 @@ |
| 1074 | 1075 | 'retryMsg' => '', |
| 1075 | 1076 | 'invalidamount' => '', |
| 1076 | 1077 | 'card_num' => '', |
| 1077 | | - 'card' => '', |
| | 1078 | + 'card_type' => '', |
| 1078 | 1079 | 'cvv' => '', |
| 1079 | 1080 | 'fname' => '', |
| 1080 | 1081 | 'lname' => '', |
| Index: branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | </td> |
| 142 | 142 | </tr> |
| 143 | 143 | <tr> |
| 144 | | - <td colspan="2"><span class="creditcard-error-msg">#card#card_num</span></td> |
| | 144 | + <td colspan="2"><span class="creditcard-error-msg">#card_num</span></td> |
| 145 | 145 | </tr> |
| 146 | 146 | <tr> |
| 147 | 147 | <td class="label"><label for="card_num">Card number</label></td> |
| Index: branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html |
| — | — | @@ -172,7 +172,7 @@ |
| 173 | 173 | </td> |
| 174 | 174 | </tr> |
| 175 | 175 | <tr> |
| 176 | | - <td colspan=2><span class="creditcard-error-msg">#card#card_num</span></td> |
| | 176 | + <td colspan=2><span class="creditcard-error-msg">#card_num</span></td> |
| 177 | 177 | <tr> |
| 178 | 178 | <tr> |
| 179 | 179 | <td class="label"><label for="card_num">Card number</label></td> |
| Index: branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | '@zip', // => $wgRequest->getText( 'zip' ), |
| 30 | 30 | '@country', // => $wgRequest->getText( 'country' ), |
| 31 | 31 | '@card_num', // => str_replace( ' ', '', $wgRequest->getText( 'card_num' ) ), |
| 32 | | - '@card', // => $wgRequest->getText( 'card' ), |
| | 32 | + '@card_type', // => $wgRequest->getText( 'card_type' ), |
| 33 | 33 | '@expiration', // => $wgRequest->getText( 'mos' ) . substr( $wgRequest->getText( 'year' ), 2, 2 ), |
| 34 | 34 | '@cvv', // => $wgRequest->getText( 'cvv' ), |
| 35 | 35 | '@currency_code', //'currency' => $wgRequest->getText( 'currency_code' ), |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | '#retryMsg', |
| 69 | 69 | '#amount', |
| 70 | 70 | '#card_num', |
| 71 | | - '#card', |
| | 71 | + '#card_type', |
| 72 | 72 | '#cvv', |
| 73 | 73 | '#fname', |
| 74 | 74 | '#lname', |
| Index: branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php |
| — | — | @@ -54,11 +54,11 @@ |
| 55 | 55 | * @param $par Mixed: parameter passed to the page or null |
| 56 | 56 | */ |
| 57 | 57 | public function execute( $par ) { |
| 58 | | - global $wgRequest, $wgOut, $wgScriptPath, |
| | 58 | + global $wgRequest, $wgOut, $wgExtensionAssetsPath, |
| 59 | 59 | $wgPayFlowProGatewayCSSVersion; |
| 60 | 60 | |
| 61 | 61 | $wgOut->addExtensionStyle( |
| 62 | | - "{$wgScriptPath}/extensions/DonationInterface/gateway_forms/css/gateway.css?284" . |
| | 62 | + $wgExtensionAssetsPath . '/DonationInterface/gateway_forms/css/gateway.css?284' . |
| 63 | 63 | $wgPayFlowProGatewayCSSVersion ); |
| 64 | 64 | |
| 65 | 65 | $scriptVars = array( |
| — | — | @@ -73,6 +73,7 @@ |
| 74 | 74 | 'globalcollectGatewayErrorMsgState' => wfMsg( 'globalcollect_gateway-error-msg-state' ), |
| 75 | 75 | 'globalcollectGatewayErrorMsgZip' => wfMsg( 'globalcollect_gateway-error-msg-zip' ), |
| 76 | 76 | 'globalcollectGatewayErrorMsgCountry' => wfMsg( 'globalcollect_gateway-error-msg-country' ), |
| | 77 | + 'globalcollectGatewayErrorMsgCardType' => wfMsg( 'globalcollect_gateway-error-msg-card_type' ), |
| 77 | 78 | 'globalcollectGatewayErrorMsgCardNum' => wfMsg( 'globalcollect_gateway-error-msg-card_num' ), |
| 78 | 79 | 'globalcollectGatewayErrorMsgExpiration' => wfMsg( 'globalcollect_gateway-error-msg-expiration' ), |
| 79 | 80 | 'globalcollectGatewayErrorMsgCvv' => wfMsg( 'globalcollect_gateway-error-msg-cvv' ), |
| — | — | @@ -586,7 +587,7 @@ |
| 587 | 588 | 'retryMsg' => '', |
| 588 | 589 | 'invalidamount' => '', |
| 589 | 590 | 'card_num' => '', |
| 590 | | - 'card' => '', |
| | 591 | + 'card_type' => '', |
| 591 | 592 | 'cvv' => '', |
| 592 | 593 | 'fname' => '', |
| 593 | 594 | 'lname' => '', |