Index: trunk/extensions/DonationInterface/gateway_common/DonationData.php |
— | — | @@ -58,6 +58,7 @@ |
59 | 59 | 'cvv' => $wgRequest->getText( 'cvv' ), |
60 | 60 | 'currency' => $wgRequest->getText( 'currency_code' ), |
61 | 61 | 'payment_method' => $wgRequest->getText( 'payment_method' ), |
| 62 | + 'payment_submethod' => $wgRequest->getText( 'payment_submethod', null ), // Used by GlobalCollect for payment types |
62 | 63 | 'order_id' => $wgRequest->getText( 'order_id', null ), //as far as I know, this won't actually ever pull anything back. |
63 | 64 | 'i_order_id' => $wgRequest->getText( 'i_order_id', null ), //internal id for each contribution attempt |
64 | 65 | 'numAttempt' => $wgRequest->getVal( 'numAttempt', 0 ), |
— | — | @@ -70,7 +71,8 @@ |
71 | 72 | 'comment-option' => $wgRequest->getText( 'comment-option' ), |
72 | 73 | 'comment' => $wgRequest->getText( 'comment' ), |
73 | 74 | 'email-opt' => $wgRequest->getText( 'email-opt' ), |
74 | | - 'test_string' => $wgRequest->getText( 'process' ), // for showing payflow string during testing |
| 75 | + // test_string has been disabled - may no longer be needed. |
| 76 | + //'test_string' => $wgRequest->getText( 'process' ), // for showing payflow string during testing |
75 | 77 | '_cache_' => $wgRequest->getText( '_cache_', null ), |
76 | 78 | 'token' => $wgRequest->getText( 'token', null ), |
77 | 79 | 'contribution_tracking_id' => $wgRequest->getText( 'contribution_tracking_id' ), |
— | — | @@ -79,7 +81,6 @@ |
80 | 82 | 'gateway' => $wgRequest->getText( 'gateway' ), //likely to be reset shortly by setGateway(); |
81 | 83 | 'owa_session' => $wgRequest->getText( 'owa_session', null ), |
82 | 84 | 'owa_ref' => $wgRequest->getText( 'owa_ref', null ), |
83 | | - 'transaction_type' => $wgRequest->getText( 'transaction_type', null ), // Used by GlobalCollect for payment types |
84 | 85 | ); |
85 | 86 | if ( !$wgRequest->wasPosted() ) { |
86 | 87 | $this->setVal( 'posted', false ); |
— | — | @@ -150,6 +151,7 @@ |
151 | 152 | 'cvv' => '001', |
152 | 153 | 'currency' => 'USD', |
153 | 154 | 'payment_method' => $wgRequest->getText( 'payment_method' ), |
| 155 | + 'payment_submethod' => $wgRequest->getText( 'payment_submethod' ), |
154 | 156 | 'order_id' => '1234567890', |
155 | 157 | 'i_order_id' => '1234567890', |
156 | 158 | 'numAttempt' => 0, |
— | — | @@ -161,7 +163,8 @@ |
162 | 164 | 'comment-option' => $wgRequest->getText( 'comment-option' ), |
163 | 165 | 'comment' => $wgRequest->getText( 'comment' ), |
164 | 166 | 'email-opt' => $wgRequest->getText( 'email-opt' ), |
165 | | - 'test_string' => $wgRequest->getText( 'process' ), |
| 167 | + // test_string has been disabled - may no longer be needed. |
| 168 | + //'test_string' => $wgRequest->getText( 'process' ), |
166 | 169 | 'token' => '', |
167 | 170 | 'contribution_tracking_id' => $wgRequest->getText( 'contribution_tracking_id' ), |
168 | 171 | 'data_hash' => $wgRequest->getText( 'data_hash' ), |
— | — | @@ -169,7 +172,6 @@ |
170 | 173 | 'gateway' => 'payflowpro', |
171 | 174 | 'owa_session' => $wgRequest->getText( 'owa_session', null ), |
172 | 175 | 'owa_ref' => 'http://localhost/defaultTestData', |
173 | | - 'transaction_type' => '', // Used by GlobalCollect for payment types |
174 | 176 | ); |
175 | 177 | } |
176 | 178 | } |