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/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(15), `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();
@@ -97,7 +103,7 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL)
                 'metadata' => array(
                     'invoice_id' => $params['invoiceid'],
                 ),
-                'issuer' => ((isset($_POST['issuer']) && !empty($_POST['issuer'])) ? $_POST['issuer'] : NULL)
+                'dueDate' => (($method == \Mollie\Api\Types\PaymentMethod::BANKTRANSFER) ? date('Y-m-d', strtotime('+100 days')) : NULL),
             ));
 
             update_query('gateway_mollie', array('paymentid' => $payment->id), array('id' => $transactionId));
@@ -107,18 +113,6 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL)
         } else {
             $return = '<form action="viewinvoice.php?id=' . $params['invoiceid'] . '" method="POST">';
 
-            if ($method == \Mollie\Api\Types\PaymentMethod::IDEAL) {
-                $issuers = $mollie->methods->get('ideal', ['include' => 'issuers'])->issuers;
-
-                $return .= '<label for="issuer">' . $_GATEWAYLANG['selectBank'] . ':</label> ';
-
-                $return .= '<select name="issuer">';
-                foreach ($issuers as $issuer) {
-                    $return .= '<option value=' . htmlspecialchars($issuer->id) . '>' . htmlspecialchars($issuer->name) . '</option>';
-                }
-                $return .= '</select>';
-            }
-
             $return .= '<input type="submit" name="start" value="' . $_GATEWAYLANG['payWith' . ucfirst($method)] . '" /></form>';
 
             return $return;

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

@@ -2,21 +2,21 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function mollieinghomepay_devapp_config()
+function molliebillie_devapp_config()
 {
     $config = mollie_config();
 
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie ING Home\'Pay'
+            'Value' => 'Mollie Billie'
         )
     ));
 
     return $config;
 }
 
-function mollieinghomepay_devapp_link($params)
+function molliebillie_devapp_link($params)
 {
-    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::INGHOMEPAY);
+    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);
+}