Index: trunk/extensions/DonationInterface/gateway_common/gateway.adapter.php |
— | — | @@ -1,5 +1,4 @@ |
2 | 2 | <?php |
3 | | - |
4 | 3 | /** |
5 | 4 | * Wikimedia Foundation |
6 | 5 | * |
— | — | @@ -109,13 +108,18 @@ |
110 | 109 | protected $transactions; |
111 | 110 | |
112 | 111 | /** |
113 | | - * $transaction_type will be set in the GatewayForm::execute() |
| 112 | + * $transaction_groups will be defined by the adapter. |
114 | 113 | * |
115 | | - * @var string|false |
| 114 | + * @var array $transaction_groups |
| 115 | + */ |
| 116 | + protected $transaction_groups = array(); |
| 117 | + |
| 118 | + /** |
| 119 | + * $transaction_types will be defined by the adapter. |
116 | 120 | * |
117 | | - * @see GatewayForm::execute() |
| 121 | + * @var array $transaction_types |
118 | 122 | */ |
119 | | - protected $transaction_type = false; |
| 123 | + protected $transaction_types = array(); |
120 | 124 | |
121 | 125 | /** |
122 | 126 | * Staged variables. This is affected by the transaction type. |
— | — | @@ -173,7 +177,6 @@ |
174 | 178 | //TODO: Fix this a bit. |
175 | 179 | |
176 | 180 | $this->posted = $wgRequest->wasPosted(); |
177 | | - |
178 | 181 | $this->setPostDefaults( $postDefaults ); |
179 | 182 | $this->defineTransactions(); |
180 | 183 | $this->defineVarMap(); |
— | — | @@ -182,7 +185,7 @@ |
183 | 186 | |
184 | 187 | //Don't bother setting the transaction type if it's not something. |
185 | 188 | if ( $this->dataObj->isSomething( 'transaction_type' ) ) { |
186 | | - $this->currentTransaction( $this->postdata['transaction_type'] ); |
| 189 | + $this->currentTransaction('INSERT_ORDERWITHPAYMENT'); |
187 | 190 | } |
188 | 191 | |
189 | 192 | $this->displaydata = $this->postdata; |