Merge pull request #35 from qarizma/master

Renamed gateways and fixed conflict

src/mollie/callback.php

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

src/molliebancontact_devapp.php

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

src/molliebanktransfer_devapp.php

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

src/molliebelfius_devapp.php

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

src/molliebitcoin_devapp.php

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

src/molliecreditcard_devapp.php

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

src/molliepaypal_devapp.php

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

src/molliepaysafecard_devapp.php

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

src/molliesofort_devapp.php

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