| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/gateway.adapter.php |
| — | — | @@ -247,7 +247,7 @@ |
| 248 | 248 | $this->debugarray[] = 'Token MISMATCH'; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | | - $this->refreshGatewayValueFromSource( 'token' ); |
| | 251 | + $this->refreshGatewayValueFromSource( 'token' ); |
| 252 | 252 | return $checkResult; |
| 253 | 253 | } |
| 254 | 254 | |
| — | — | @@ -1285,7 +1285,7 @@ |
| 1286 | 1286 | $utm_source_parts[2] = 'pp'; |
| 1287 | 1287 | $data['utm_source'] = implode( ".", $utm_source_parts ); |
| 1288 | 1288 | $data['gateway'] = 'paypal'; |
| 1289 | | - $data['currency_code'] = $data['currency']; |
| | 1289 | + $data['currency_code'] = isset( $data['currency'] ) ? $data['currency'] : 'USD'; |
| 1290 | 1290 | |
| 1291 | 1291 | // Add our response vars to the data object. |
| 1292 | 1292 | $this->dataObj->addData( $data ); |
| — | — | @@ -1302,7 +1302,6 @@ |
| 1303 | 1303 | |
| 1304 | 1304 | protected function getPaypalData() { |
| 1305 | 1305 | $paypalkeys = array( |
| 1306 | | - 'gateway', |
| 1307 | 1306 | 'contribution_tracking_id', |
| 1308 | 1307 | 'comment', |
| 1309 | 1308 | 'referrer', |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/DonationData.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | 'card_type' => $wgRequest->getText( 'card_type' ), |
| 58 | 58 | 'expiration' => $wgRequest->getText( 'mos' ) . substr( $wgRequest->getText( 'year' ), 2, 2 ), |
| 59 | 59 | 'cvv' => $wgRequest->getText( 'cvv' ), |
| 60 | | - 'currency' => $wgRequest->getText( 'currency_code' ), |
| | 60 | + 'currency' => $wgRequest->getText( 'currency_code', 'USD' ), |
| 61 | 61 | 'payment_method' => $wgRequest->getText( 'payment_method' ), |
| 62 | 62 | 'payment_submethod' => $wgRequest->getText( 'payment_submethod', null ), // Used by GlobalCollect for payment types |
| 63 | 63 | 'issuer_id' => $wgRequest->getText( 'issuer_id' ), |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 64 | 64 | Merged /trunk/extensions/DonationInterface:r101230,101232 |