Merge pull request #35 from qarizma/master

Renamed gateways and fixed conflict
This commit is contained in:
Wouter van Os
2018-05-26 22:54:59 +02:00
committed by GitHub
9 changed files with 161 additions and 161 deletions

View File

@@ -29,7 +29,7 @@ if(isset($_POST['id'])) {
$transaction = mysql_fetch_assoc($transactionQuery); $transaction = mysql_fetch_assoc($transactionQuery);
$_GATEWAY = getGatewayVariables('mollie' . $transaction['method']); $_GATEWAY = getGatewayVariables('mollie' . $transaction['method'] . '_devapp');
if ($transaction['status'] != 'open') { if ($transaction['status'] != 'open') {
logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 3 (Transaction not open)'); logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 3 (Transaction not open)');

View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliemistercash_config() { function molliebancontact_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliemistercash_config() {
return $config; return $config;
} }
function molliemistercash_link($params) { function molliebancontact_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::MISTERCASH); return mollie_link($params, Mollie_API_Object_Method::MISTERCASH);
} }

View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliebanktransfer_config() { function molliebanktransfer_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliebanktransfer_config() {
return $config; return $config;
} }
function molliebanktransfer_link($params) { function molliebanktransfer_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::BANKTRANSFER); return mollie_link($params, Mollie_API_Object_Method::BANKTRANSFER);
} }

4
src/molliebelfius.php → src/molliebelfius_devapp.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliebelfius_config() { function molliebelfius_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliebelfius_config() {
return $config; return $config;
} }
function molliebelfius_link($params) { function molliebelfius_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::BELFIUS); return mollie_link($params, Mollie_API_Object_Method::BELFIUS);
} }

4
src/molliebitcoin.php → src/molliebitcoin_devapp.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliebitcoin_config() { function molliebitcoin_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliebitcoin_config() {
return $config; return $config;
} }
function molliebitcoin_link($params) { function molliebitcoin_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::BITCOIN); return mollie_link($params, Mollie_API_Object_Method::BITCOIN);
} }

View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliecreditcard_config() { function molliecreditcard_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliecreditcard_config() {
return $config; return $config;
} }
function molliecreditcard_link($params) { function molliecreditcard_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::CREDITCARD); return mollie_link($params, Mollie_API_Object_Method::CREDITCARD);
} }

4
src/molliepaypal.php → src/molliepaypal_devapp.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliepaypal_config() { function molliepaypal_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliepaypal_config() {
return $config; return $config;
} }
function molliepaypal_link($params) { function molliepaypal_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::PAYPAL); return mollie_link($params, Mollie_API_Object_Method::PAYPAL);
} }

View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliepaysafecard_config() { function molliepaysafecard_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliepaysafecard_config() {
return $config; return $config;
} }
function molliepaysafecard_link($params) { function molliepaysafecard_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::PAYSAFECARD); return mollie_link($params, Mollie_API_Object_Method::PAYSAFECARD);
} }

4
src/molliesofort.php → src/molliesofort_devapp.php Executable file → Normal file
View File

@@ -2,7 +2,7 @@
require_once __DIR__ . '/mollie/mollie.php'; require_once __DIR__ . '/mollie/mollie.php';
function molliesofort_config() { function molliesofort_devapp_config() {
$config = mollie_config(); $config = mollie_config();
$config = array_merge($config, array( $config = array_merge($config, array(
@@ -15,6 +15,6 @@ function molliesofort_config() {
return $config; return $config;
} }
function molliesofort_link($params) { function molliesofort_devapp_link($params) {
return mollie_link($params, Mollie_API_Object_Method::SOFORT); return mollie_link($params, Mollie_API_Object_Method::SOFORT);
} }