| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php |
| — | — | @@ -160,19 +160,8 @@ |
| 161 | 161 | return $wgOut->redirect( $formAction ); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | | - } elseif ( $payment_method == 'cash' ) { |
| 165 | | - |
| | 164 | + } else { |
| 166 | 165 | $this->adapter->do_transaction( 'INSERT_ORDERWITHPAYMENT' ); |
| 167 | | - |
| 168 | | - $formAction = $this->adapter->getTransactionDataFormAction(); |
| 169 | | - |
| 170 | | - // Redirect to the bank |
| 171 | | - if ( !empty( $formAction ) ) { |
| 172 | | - return $wgOut->redirect( $formAction ); |
| 173 | | - } |
| 174 | | - |
| 175 | | - } else { |
| 176 | | - $this->adapter->do_transaction( 'INSERT_ORDERWITHPAYMENT' ); |
| 177 | 166 | } |
| 178 | 167 | |
| 179 | 168 | return $this->resultHandler(); |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect.adapter.php |
| — | — | @@ -314,7 +314,6 @@ |
| 315 | 315 | 'SWIFTCODE' => 'swift_code', |
| 316 | 316 | 'TRANSACTIONTYPE' => 'transaction_type', // dd:GB,NL |
| 317 | 317 | 'ZIP' => 'zip', |
| 318 | | - 'FISCALNUMBER' => 'fiscal_number', //Boletos |
| 319 | 318 | ); |
| 320 | 319 | } |
| 321 | 320 | |
| — | — | @@ -630,13 +629,6 @@ |
| 631 | 630 | 'label' => 'Real time bank transfer', |
| 632 | 631 | 'types' => array( 'rtbt_ideal', 'rtbt_eps', 'rtbt_sofortuberweisung', 'rtbt_nordea_sweden', 'rtbt_enets', ), |
| 633 | 632 | ); |
| 634 | | - |
| 635 | | - // Cash payments |
| 636 | | - $this->payment_meathods['cash'] = array( |
| 637 | | - 'label' => 'Cash payments', |
| 638 | | - 'types' => array( 'cash_boleto', ), |
| 639 | | - ); |
| 640 | | - |
| 641 | 633 | } |
| 642 | 634 | |
| 643 | 635 | /** |
| — | — | @@ -761,7 +753,6 @@ |
| 762 | 754 | 'keys' => array(), |
| 763 | 755 | ); |
| 764 | 756 | |
| 765 | | - |
| 766 | 757 | /* |
| 767 | 758 | * Direct debit |
| 768 | 759 | * |
| — | — | @@ -977,16 +968,6 @@ |
| 978 | 969 | 831 => 'Sparda-Bank', |
| 979 | 970 | ) |
| 980 | 971 | ); |
| 981 | | - |
| 982 | | - // Cash Payments - Boletos |
| 983 | | - |
| 984 | | - $this->payment_submeathods['cash_boleto'] = array( |
| 985 | | - 'paymentproductid' => 1503, |
| 986 | | - 'label' => 'Boleto Bancario Brazil', |
| 987 | | - 'group' => 'cash', |
| 988 | | - 'validation' => array(), |
| 989 | | - 'keys' => array(), |
| 990 | | - ); |
| 991 | 972 | } |
| 992 | 973 | |
| 993 | 974 | /** |
| — | — | @@ -1972,14 +1953,6 @@ |
| 1973 | 1954 | $this->setupStagePaymentMethodForEWallets( $payment_submethod, $type); |
| 1974 | 1955 | break; |
| 1975 | 1956 | |
| 1976 | | - /* Cash payments */ |
| 1977 | | - case 'cash_boleto': |
| 1978 | | - $this->staged_data['payment_product'] = $this->payment_submethods[ $payment_submethod ]['paymentproductid']; |
| 1979 | | - $this->var_map['PAYMENTPRODUCTID'] = 'payment_product'; |
| 1980 | | - |
| 1981 | | - $this->addKeyToTransaction('FISCALNUMBER'); |
| 1982 | | - break; |
| 1983 | | - |
| 1984 | 1957 | /* Online bank transfer */ |
| 1985 | 1958 | case 'bpay': |
| 1986 | 1959 | $this->staged_data['payment_product'] = $this->payment_submethods[ $payment_submethod ]['paymentproductid']; |
| Index: trunk/extensions/DonationInterface/gateway_common/interface.i18n.php |
| — | — | @@ -343,7 +343,7 @@ |
| 344 | 344 | 'donate_interface-bt-country_description' => 'Country description', |
| 345 | 345 | 'donate_interface-bt-payment_reference' => 'Payment reference', |
| 346 | 346 | 'donate_interface-bt-swift_code' => 'Swift code', |
| 347 | | - 'donate_interface-bt-special_id' => 'Country specific information', |
| | 347 | + 'donate_interface-bt-special_id' => 'Special ID', |
| 348 | 348 | 'donate_interface-bt-information' => 'Bank transfer information', |
| 349 | 349 | 'donate_interface-bt-finished' => 'Finished', |
| 350 | 350 | |
| — | — | @@ -413,7 +413,6 @@ |
| 414 | 414 | |
| 415 | 415 | // HTTP errors |
| 416 | 416 | 'donate_interface-error-http-403' => 'You do not have permission to access this page.', |
| 417 | | - |
| 418 | 417 | ); |
| 419 | 418 | |
| 420 | 419 | /** Message documentation (Message documentation) |
| — | — | @@ -758,7 +757,7 @@ |
| 759 | 758 | 'donate_interface-bt-country_description' => 'Bank transfer: Country description', |
| 760 | 759 | 'donate_interface-bt-payment_reference' => 'Bank transfer: Payment reference', |
| 761 | 760 | 'donate_interface-bt-swift_code' => 'Bank transfer: Swift code', |
| 762 | | - 'donate_interface-bt-special_id' => 'Bank transfer: Label for country specific bank transfer information (for example ABA number for the USA)', |
| | 761 | + 'donate_interface-bt-special_id' => 'Bank transfer: Special ID', |
| 763 | 762 | 'donate_interface-bt-information' => 'Bank transfer: Bank transfer information', |
| 764 | 763 | 'donate_interface-bt-finished' => 'Bank transfer: Finished - this is a link or a button to take the user to the Thank you page for their donation.', |
| 765 | 764 | 'donate_interface-obt-biller_id' => 'BPAY (Australian Online Bank Transfer) - The label for biller code', |