| Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php |
| — | — | @@ -608,11 +608,6 @@ |
| 609 | 609 | // include date |
| 610 | 610 | $transaction['date'] = time(); |
| 611 | 611 | |
| 612 | | - $transaction['country_name'] = $countries[$data['country']]; |
| 613 | | - $transaction['country_code'] = $data['country']; |
| 614 | | - $transaction['country_name2'] = $countries[$data['country2']]; |
| 615 | | - $transaction['country_code2'] = $data['country2']; |
| 616 | | - |
| 617 | 612 | // put all data into one array |
| 618 | 613 | $optout = $this->determineOptOut( $data ); |
| 619 | 614 | $data[ 'anonymous' ] = $optout[ 'anonymous' ]; |
| Index: trunk/extensions/DonationInterface/activemq_stomp/activemq_stomp.php |
| — | — | @@ -152,8 +152,7 @@ |
| 153 | 153 | 'supplemental_address_1' => '', |
| 154 | 154 | 'city' => $transaction['city'], |
| 155 | 155 | 'state_province' => $transaction['state'], |
| 156 | | - 'country' => $transaction['country_name'], |
| 157 | | - 'countryID' => $transaction['country_code'], |
| | 156 | + 'country' => $transaction['country'], |
| 158 | 157 | 'postal_code' => $transaction['zip'], |
| 159 | 158 | 'first_name_2' => $transaction['fname2'], |
| 160 | 159 | 'last_name_2' => $transaction['lname2'], |
| — | — | @@ -161,8 +160,7 @@ |
| 162 | 161 | 'supplemental_address_2' => '', |
| 163 | 162 | 'city_2' => $transaction['city2'], |
| 164 | 163 | 'state_province_2' => $transaction['state2'], |
| 165 | | - 'country_2' => $transaction['country_name2'], |
| 166 | | - 'countryID_2' => $transaction['country_code2'], |
| | 164 | + 'country_2' => $transaction['country2'], |
| 167 | 165 | 'postal_code_2' => $transaction['zip'], |
| 168 | 166 | 'gateway' => $transaction[ 'gateway' ], |
| 169 | 167 | 'gateway_txn_id' => $transaction['PNREF'], |