Merge pull request #113 from lennarttd/master

Update payment methods

composer.json

@@ -1,6 +1,6 @@
 {
   "require": {
-    "mollie/mollie-api-php": "^2.0"
+    "mollie/mollie-api-php": "^3.7"
   },
   "config": {
     "vendor-dir": "src/mollie/vendor"

src/mollie/callback.php

@@ -1,92 +1,97 @@
 <?php
-use Illuminate\Database\Capsule\Manager as Capsule;
+/**
-use Mollie\Api\MollieApiClient;
+ *
-
+ *    Setting requirements and includes
+ *
+ */
 require_once __DIR__ . '/../../../init.php';
 require_once __DIR__ . '/vendor/autoload.php';
 
 $whmcs->load_function('gateway');
 $whmcs->load_function('invoice');
 
-if ($_SERVER['REQUEST_METHOD'] !== 'POST' || empty($_POST['id'])) {
+/**
-    logTransaction('mollieunknown', $_POST, 'Callback - Failure 0 (Arg mismatch)');
+ *
-    http_response_code(500);
+ *    Check parameters
-    exit('Arg mismatch');
+ *
-}
+ */
+if (isset($_POST['id'])) {
 
-// Find transaction by Mollie payment ID
+    // Get transaction
-$transaction = Capsule::table('gateway_mollie')
+    $transactionQuery = select_query('gateway_mollie', '', array('paymentid' => $_POST['id']), null, null, 1);
-    ->where('paymentid', $_POST['id'])
-    ->first();
 
-if (!$transaction) {
+    if (mysql_num_rows($transactionQuery) != 1) {
-    logTransaction('mollieunknown', $_POST, 'Callback - Failure 2 (Transaction not found)');
+        logTransaction('mollieunknown', $_POST, 'Callback - Failure 2 (Transaction not found)');
-    http_response_code(500);
-    exit('Transaction not found');
-}
 
-$transaction = (array) $transaction;
+        header('HTTP/1.1 500 Transaction not found');
-$method = $transaction['method'] ?: 'checkout';
+        exit();
-
-// Load gateway configuration
-$_GATEWAY = getGatewayVariables('mollie' . $method . '_devapp');
-
-if ($transaction['status'] !== 'open') {
-    logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 3 (Transaction not open)');
-    http_response_code(500);
-    exit('Transaction not open');
-}
-
-// Load currencies
-$userCurrency = getCurrency($transaction['userid']);
-$transactionCurrency = Capsule::table('tblcurrencies')
-    ->where('id', $transaction['currencyid'])
-    ->first();
-
-$transactionCurrency = (array) $transactionCurrency;
-
-// Init Mollie
-$mollie = new MollieApiClient();
-$mollie->setApiKey($_GATEWAY['key']);
-
-try {
-    $payment = $mollie->payments->get($_POST['id']);
-} catch (Exception $e) {
-    logTransaction($_GATEWAY['paymentmethod'], $_POST, 'Callback - Failure 4 (API Error): ' . $e->getMessage());
-    http_response_code(500);
-    exit('Mollie API error');
-}
-
-// Handle payment status
-if ($payment->isPaid()) {
-    // Currency conversion if needed
-    if ($transactionCurrency['id'] != $userCurrency['id']) {
-        $transaction['amount'] = convertCurrency($transaction['amount'], $transaction['currencyid'], $userCurrency['id']);
     }
 
-    $invoiceid = checkCbInvoiceID($transaction['invoiceid'], $_GATEWAY['paymentmethod']);
+    $transaction = mysql_fetch_assoc($transactionQuery);
-    checkCbTransID($transaction['paymentid']);
-    addInvoicePayment($invoiceid, $transaction['paymentid'], $transaction['amount'], '', $_GATEWAY['paymentmethod']);
 
-    Capsule::table('gateway_mollie')
+    $method = $transaction['method'];
-        ->where('id', $transaction['id'])
-        ->update(['status' => 'paid', 'updated' => date('Y-m-d H:i:s')]);
 
-    logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Successful (Paid)');
+    if (empty($method)) {
-    http_response_code(200);
+        $method = 'checkout';
-    exit('OK');
+    }
 
-} elseif (!$payment->isOpen()) {
+    $_GATEWAY = getGatewayVariables('mollie' . $method . '_devapp');
-    Capsule::table('gateway_mollie')
-        ->where('id', $transaction['id'])
-        ->update(['status' => 'closed', 'updated' => date('Y-m-d H:i:s')]);
 
-    logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Successful (Closed)');
+    if ($transaction['status'] != 'open') {
-    http_response_code(200);
+        logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 3 (Transaction not open)');
-    exit('Closed');
 
+        header('HTTP/1.1 500 Transaction not open');
+        exit();
+    }
+
+    // Get user and transaction currencies
+    $userCurrency = getCurrency($transaction['userid']);
+    $transactionCurrency = select_query('tblcurrencies', '', array('id' => $transaction['currencyid']));
+    $transactionCurrency = mysql_fetch_assoc($transactionCurrency);
+
+    // Check payment
+    $mollie = new \Mollie\Api\MollieApiClient();
+    $mollie->setApiKey($_GATEWAY['key']);
+
+    $payment = $mollie->payments->get($_POST['id']);
+
+    if ($payment->isPaid()) {
+
+        // Add conversion, when there is need to. WHMCS only supports currencies per user. WHY?!
+        if ($transactionCurrency['id'] != $userCurrency['id']) {
+            $transaction['amount'] = convertCurrency($transaction['amount'], $transaction['currencyid'], $userCurrency['id']);
+        }
+
+        // Check invoice
+        $invoiceid = checkCbInvoiceID($transaction['invoiceid'], $_GATEWAY['paymentmethod']);
+
+        checkCbTransID($transaction['paymentid']);
+
+        // Add invoice
+        addInvoicePayment($invoiceid, $transaction['paymentid'], $transaction['amount'], '', $_GATEWAY['paymentmethod']);
+
+        update_query('gateway_mollie', array('status' => 'paid', 'updated' => date('Y-m-d H:i:s', time())), array('id' => $transaction['id']));
+
+        logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Successful (Paid)');
+
+        header('HTTP/1.1 200 OK');
+        exit();
+    } else if ($payment->isOpen() == FALSE) {
+        update_query('gateway_mollie', array('status' => 'closed', 'updated' => date('Y-m-d H:i:s', time())), array('id' => $transaction['id']));
+
+        logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Successful (Closed)');
+
+        header('HTTP/1.1 200 OK');
+        exit();
+    } else {
+        logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 1 (Payment not open or paid)');
+
+        header('HTTP/1.1 500 Payment not open or paid');
+        exit();
+    }
 } else {
-    logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 1 (Payment not open or paid)');
+    logTransaction('mollieunknown', $_POST, 'Callback - Failure 0 (Arg mismatch)');
-    http_response_code(500);
+
-    exit('Payment not open or paid');
+    header('HTTP/1.1 500 Arg mismatch');
-}
+    exit();
+}

src/mollie/mollie.php

@@ -41,7 +41,13 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL)
     $tableCheckQuery = full_query('SHOW TABLES LIKE \'gateway_mollie\'');
 
     if (mysql_num_rows($tableCheckQuery) != 1) {
-        full_query('CREATE TABLE IF NOT EXISTS `gateway_mollie` (`id` int(11) NOT NULL AUTO_INCREMENT, `paymentid` varchar(40), `amount` double NOT NULL, `currencyid` int(11) NOT NULL, `ip` varchar(50) NOT NULL, `userid` int(11) NOT NULL, `invoiceid` int(11) NOT NULL, `status` ENUM(\'open\',\'paid\',\'closed\') NOT NULL DEFAULT \'open\', `method` VARCHAR(25) NOT NULL,  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated` timestamp NULL DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `paymentid` (`paymentid`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;');
+        full_query('CREATE TABLE IF NOT EXISTS `gateway_mollie` (`id` int(11) NOT NULL AUTO_INCREMENT, `paymentid` varchar(64), `amount` double NOT NULL, `currencyid` int(11) NOT NULL, `ip` varchar(50) NOT NULL, `userid` int(11) NOT NULL, `invoiceid` int(11) NOT NULL, `status` ENUM(\'open\',\'paid\',\'closed\') NOT NULL DEFAULT \'open\', `method` VARCHAR(25) NOT NULL,  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated` timestamp NULL DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `paymentid` (`paymentid`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;');
+    }
+
+    $paymentIdQuery = full_query("SHOW COLUMNS FROM `gateway_mollie` WHERE `Field` = 'paymentid' AND `Type` LIKE '%64%'");
+
+    if (mysql_num_rows($paymentIdQuery) == 0) {
+        full_query("ALTER TABLE `gateway_mollie` CHANGE `paymentid` `paymentid` VARCHAR(64);");
     }
 
     $mollie = new \Mollie\Api\MollieApiClient();

src/molliealma_devapp.php

@@ -2,21 +2,21 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function molliegiropay_devapp_config()
+function molliealma_devapp_config()
 {
     $config = mollie_config();
 
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Giropay'
+            'Value' => 'Mollie Alma'
         )
     ));
 
     return $config;
 }
 
-function molliegiropay_devapp_link($params)
+function molliealma_devapp_link($params)
 {
-    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::GIROPAY);
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::ALMA);
 }

src/molliebacs_devapp.php

@@ -2,21 +2,21 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function molliesofort_devapp_config()
+function molliebacs_devapp_config()
 {
     $config = mollie_config();
 
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Sofort Banking'
+            'Value' => 'Mollie Bacs'
         )
     ));
 
     return $config;
 }
 
-function molliesofort_devapp_link($params)
+function molliebacs_devapp_link($params)
 {
-    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::SOFORT);
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BACS);
 }

src/molliebancomatpay_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebancomatpay_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie BANCOMAT Pay'
+        )
+    ));
+
+    return $config;
+}
+
+function molliebancomatpay_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BANCOMATPAY);
+}

src/molliebelfius_devapp.php

@@ -9,7 +9,7 @@ function molliebelfius_devapp_config()
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Belfius'
+            'Value' => 'Mollie Belfius Pay Button'
         )
     ));
 

src/molliebillie_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebillie_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Billie'
+        )
+    ));
+
+    return $config;
+}
+
+function molliebillie_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BILLIE);
+}

src/mollieblik_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieblik_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie BLIK'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieblik_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BLIK);
+}

src/mollieideal_devapp.php

@@ -9,7 +9,7 @@ function mollieideal_devapp_config()
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie iDeal'
+            'Value' => 'Mollie iDEAL'
         )
     ));
 

src/molliein3_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliein3_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie iDEAL in3'
+        )
+    ));
+
+    return $config;
+}
+
+function molliein3_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::IN3);
+}

src/mollieklarna_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarna_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarna_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA);
+}

src/mollieklarnapaylater_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarnapaylater_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna Pay Later'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarnapaylater_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA_PAY_LATER);
+}

src/mollieklarnapaynow_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarnapaynow_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna Pay Now'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarnapaynow_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA_PAY_NOW);
+}

src/mollieklarnasliceit_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarnasliceit_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna Slice It'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarnasliceit_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA_SLICE_IT);
+}

src/molliembway_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliembway_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie MB Way'
+        )
+    ));
+
+    return $config;
+}
+
+function molliembway_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::MBWAY);
+}

src/molliemultibanco_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliemultibanco_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Multibanco'
+        )
+    ));
+
+    return $config;
+}
+
+function molliemultibanco_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::MULTIBANCO);
+}

src/molliepaybybank_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliepaybybank_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Pay By Bank'
+        )
+    ));
+
+    return $config;
+}
+
+function molliepaybybank_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::PAYBYBANK);
+}

src/mollieriverty_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieriverty_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Riverty'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieriverty_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::RIVERTY);
+}

src/molliesatispay_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliesatispay_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Satispay'
+        )
+    ));
+
+    return $config;
+}
+
+function molliesatispay_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::SATISPAY);
+}

src/mollieswish_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieswish_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Swish'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieswish_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::SWISH);
+}

src/mollietrustly_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollietrustly_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Trustly'
+        )
+    ));
+
+    return $config;
+}
+
+function mollietrustly_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::TRUSTLY);
+}

src/mollietwint_devapp.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollietwint_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie TWINT'
+        )
+    ));
+
+    return $config;
+}
+
+function mollietwint_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::TWINT);
+}