Update dutch.php

Renamed gateways and fixed conflict

README.md

@@ -1,13 +1,29 @@
-# Installatie #
+# WHMCS Mollie Gateway
-+ Ga naar de root van de WHMCS installatie (de hoofd folder) en voer het onderstaande commando uit.
+Onofficiële Mollie gateway voor WHMCS. In deze gratis plugin zit GEEN ondersteuning voor Mollie Recurring (SEPA/Automatisch Incasso). Hiervoor hebben we een [betaalde](https://0100dev.nl/modules/whmcs#WHMCS%20Mollie%20Recurring) plugin. Deze plugins zijn niet afhankelijk van elkaar en kunnen naast elkaar opereren maar ook zonder elkaar.
-+ ``` git clone --recursive https://github.com/0100Dev/WHMCS-Mollie.git /tmp/whmcs && sudo mv /tmp/whmcs/src ./modules/gateways/```
 
-# Ondersteunde betaalmethodes #
+Compatible met **alle** WHMCS versies.
+
+### Installatie via SSH
++ Log in op SSH (of console) en zorg dat GIT geinstalleerd is op uw webserver.
++ Ga naar de root van de WHMCS installatie (de hoofd folder) en voer het onderstaande commando uit.
++ ``` git clone --recursive https://github.com/0100Dev/WHMCS-Mollie.git /tmp/whmcs && sudo cp /tmp/whmcs/src ./modules/gateways/```
+
+### Installatie via FTP
++ Log in op FTP.
++ Download de `whmcs-mollie.tar.gz` van onze [releases pagina](https://github.com/0100Dev/WHMCS-Mollie/releases) (**LET OP:** **niet** `Source code (zip)` of `Source code (tar.gz)`!).
++ Upload alles uit de `src` folder uit de hierboven gedownloaden TAR in de `/modules/gateways` folder van uw WHMCS installatie.
+
+### Betaalmethodes
 Alle betaalmethodes van Mollie zijn ondersteund. Zet de gewenste betaalmethodes aan door de gateway in WHMCS te activeren.
 
-# Support #
+### Updates
-Support alleen in Github via haar issuetracker.
+
+#### V1.0 naar V2.0
+Deze release is NIET compatible met V1.x. Verwijder eerst alle files vanuit je /modules/gateways folder die betrekking hebben op deze gateway. Alles dus met mollie_x.php. In WHMCS dien je ook opnieuw deze gateways in te schakelen. WHMCS zal aangeven dat de ouded gateways niet meer gevonden kunnen worden, dit klopt - verwijder deze en vervang deze met de nieuw ingeschakelde.
+
+Let erop dat je bijvoorbeeld NIET onze mollierecurring.php moet verwijderen, als je onze betaalde Mollie Recurring gateway actief hebt.
+
+### Support
+Support op basis van best-effort in Github via haar issuetracker. Bbusiness support (reactietijd van max. 24 uur, normaliter <1 uur) via ons [klantenpaneel](https://my.0100dev.nl/) tegen ons uurtarief a € 45,- excl. VAT. Maak een account aan en stuur via daar een ticket in.
 
 [Meer informatie via Mollie](https://www.mollie.nl/betaaldiensten/)
-
-![Powerd By Mollie](http://www.mollie.nl/images/badge-betaling-medium.png)

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/mollie/lang/dutch.php

@@ -6,14 +6,14 @@ $_GATEWAYLANG['selectBank'] = 'Selecteer bank';
 
 $_GATEWAYLANG['errorTransactionNotFound'] = 'Transactie is niet gevonden. Probeer later opnieuw';
 
-$_GATEWAYLANG['checkPayment'] = 'We controleren je betalen, even wachten.';
+$_GATEWAYLANG['checkPayment'] = 'We controleren je betaling, moment geduld...';
 
 $_GATEWAYLANG['payWithBanktransfer'] = 'Betaal met Bank overschrijving';
 $_GATEWAYLANG['payWithBelfius'] = 'Betaal met Belfius';
 $_GATEWAYLANG['payWithBitcoin'] = 'Betaal met Bitcoin';
-$_GATEWAYLANG['payWithDirectdebit'] = 'Betaal met Automatisch Incasso';
+$_GATEWAYLANG['payWithCreditcard'] = 'Betaal met Creditcard';
 $_GATEWAYLANG['payWithIdeal'] = 'Betaal met iDeal';
-$_GATEWAYLANG['payWithMistercash'] = 'Betaal met Mistercash';
+$_GATEWAYLANG['payWithMistercash'] = 'Betaal met Bancontact';
 $_GATEWAYLANG['payWithPaypal'] = 'Betaal met PayPal';
 $_GATEWAYLANG['payWithPaysafecard'] = 'Betaal met Paysafecard';
-$_GATEWAYLANG['payWithSofort'] = 'Betaal met Sofort Banking';
+$_GATEWAYLANG['payWithSofort'] = 'Betaal met Sofort Banking';

src/mollie/lang/english.php

@@ -7,14 +7,14 @@ $_GATEWAYLANG['selectLater'] = 'Select later';
 
 $_GATEWAYLANG['errorTransactionNotFound'] = 'Transaction is not found. Please try again.';
 
-$_GATEWAYLANG['checkPayment'] = 'Checking your payment.. Please wait.';
+$_GATEWAYLANG['checkPayment'] = 'Checking your payment, please wait...';
 
 $_GATEWAYLANG['payWithBanktransfer'] = 'Pay with Bank Transfer';
 $_GATEWAYLANG['payWithBelfius'] = 'Pay with Belfius';
 $_GATEWAYLANG['payWithBitcoin'] = 'Pay with Bitcoin';
-$_GATEWAYLANG['payWithDirectdebit'] = 'Pay with Direct Debit';
+$_GATEWAYLANG['payWithCreditcard'] = 'Pay with Credit Card';
 $_GATEWAYLANG['payWithIdeal'] = 'Pay with iDeal';
-$_GATEWAYLANG['payWithMistercash'] = 'Pay with Mistercash';
+$_GATEWAYLANG['payWithMistercash'] = 'Pay with Bancontact';
 $_GATEWAYLANG['payWithPaypal'] = 'Pay with PayPal';
 $_GATEWAYLANG['payWithPaysafecard'] = 'Pay with Paysafecard';
-$_GATEWAYLANG['payWithSofort'] = 'Pay with Sofort Banking';
+$_GATEWAYLANG['payWithSofort'] = 'Pay with Sofort Banking';

src/mollie/mollie.php

@@ -66,7 +66,7 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL) {
             header('location: ' . $params['returnurl'] . '&paymentfailed=true');
             exit();
         } else {
-            return '<br/><img src="' . $params['systemurl'] . '/modules/gateways/mollie/ajax_loader.gif" /><br/>' . $_GATEWAYLANG['checkPayment'] . ' <script> window.onload = function(){ setTimeout("location.reload(true);", 2000); } </script>';
+            return '<br/><img src="' . $params['systemurl'] . 'modules/gateways/mollie/ajax_loader.gif" /><br/>' . $_GATEWAYLANG['checkPayment'] . ' <script> window.onload = function(){ setTimeout("location.reload(true);", 2000); } </script>';
         }
     } else {
         if (isset($_POST['start']) || (isset($_GET['a']) && $_GET['a'] == 'complete') || (isset($_GET['action']) && ($_GET['action'] == 'addfunds' || $_GET['action'] == 'masspay') && isset($_POST['paymentmethod']) && $_POST['paymentmethod'] == 'mollie' . $method)) {
@@ -88,7 +88,7 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL) {
                 'method' => $method,
                 'description' => $params['description'],
                 'redirectUrl' => $params['returnurl'] . '&check_payment=' . $transactionId,
-                'webhookUrl' => $params['systemurl'] . '/modules/gateways/mollie/callback.php',
+                'webhookUrl' => $params['systemurl'] . 'modules/gateways/mollie/callback.php',
                 'metadata' => array(
                     'invoice_id' => $params['invoiceid'],
                 ),
@@ -121,4 +121,4 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL) {
             return $return;
         }
     }
-}
+}

src/molliebancontact_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie Mistercash'
+			'Value'=> 'Mollie Bancontact'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}

src/molliebanktransfer_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie Bank Transfer'
+			'Value'=> 'Mollie Bank Transfer'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}

src/molliebelfius_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie Belfius'
+			'Value'=> 'Mollie Belfius'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}

src/molliebitcoin_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie Bitcoin'
+			'Value'=> 'Mollie Bitcoin'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}

src/molliecreditcard_devapp.php

@@ -0,0 +1,20 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliecreditcard_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Creditcard'
+		)
+	));
+
+	return $config;
+}
+
+function molliecreditcard_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::CREDITCARD);
+}

src/molliedirectdebit.php

@@ -1,20 +0,0 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliedirectdebit_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Direct Debit'
-		)
-	));
-
-	return $config;
-}
-
-function molliedirectdebit_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::DIRECTDEBIT);
-}

src/mollieideal_devapp.php

@@ -2,7 +2,7 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function mollieideal_config() {
+function mollieideal_devapp_config() {
 	$config = mollie_config();
 
 	$config = array_merge($config, array(
@@ -15,6 +15,6 @@ function mollieideal_config() {
 	return $config;
 }
 
-function mollieideal_link($params) {
+function mollieideal_devapp_link($params) {
 	return mollie_link($params, Mollie_API_Object_Method::IDEAL);
 }

src/molliepaypal_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie PayPal'
+			'Value'=> 'Mollie PayPal'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}

src/molliepaysafecard_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie Paysafecard'
+			'Value'=> 'Mollie Paysafecard'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}

src/molliesofort_devapp.php

@@ -1,20 +1,20 @@
-<?php
+<?php
-
+
-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(
-		'FriendlyName' => array(
+		'FriendlyName' => array(
-			'Type' => 'System',
+			'Type' => 'System',
-			'Value'=> 'Mollie Sofort Banking'
+			'Value'=> 'Mollie Sofort Banking'
-		)
+		)
-	));
+	));
-
+
-	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);
-}
+}