Fix redirect for addfunds

This fixes addfunds requests somehow.

composer.lock

@@ -247,16 +247,16 @@
         },
         {
             "name": "mollie/mollie-api-php",
-            "version": "v2.8.3",
+            "version": "v2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mollie/mollie-api-php.git",
-                "reference": "df6e0cea662f3c9603f245816cc2982e8ae49bcf"
+                "reference": "151bdb85c325f6768452a3d8461930589be85729"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/df6e0cea662f3c9603f245816cc2982e8ae49bcf",
+                "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/151bdb85c325f6768452a3d8461930589be85729",
-                "reference": "df6e0cea662f3c9603f245816cc2982e8ae49bcf",
+                "reference": "151bdb85c325f6768452a3d8461930589be85729",
                 "shasum": ""
             },
             "require": {
@@ -294,12 +294,12 @@
             "homepage": "https://www.mollie.com/en/developers",
             "keywords": [
                 "CBC",
+                "Przelewy24",
                 "api",
                 "bancontact",
                 "banktransfer",
                 "belfius",
                 "belfius direct net",
-                "bitcoin",
                 "charges",
                 "creditcard",
                 "direct debit",
@@ -328,7 +328,7 @@
                 "sofortbanking",
                 "subscriptions"
             ],
-            "time": "2019-04-11T12:19:05+00:00"
+            "time": "2019-05-20T09:07:29+00:00"
         },
         {
             "name": "psr/http-message",

src/mollie/lang/dutch.php

@@ -10,7 +10,6 @@ $_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['payWithCreditcard'] = 'Betaal met Creditcard';
 $_GATEWAYLANG['payWithIdeal'] = 'Betaal met iDeal';
 $_GATEWAYLANG['payWithBancontact'] = 'Betaal met Bancontact';
@@ -22,3 +21,5 @@ $_GATEWAYLANG['payWithGiftcard'] = 'Betaal met een cadeaukaart';
 $_GATEWAYLANG['payWithGiropay'] = 'Betaal met Giropay';
 $_GATEWAYLANG['payWithInghomepay'] = 'Betaal met ING Home\'Pay';
 $_GATEWAYLANG['payWithKbc'] = 'Betaal met KBC/CBC-betaalknop';
+$_GATEWAYLANG['payWithPrzelewy24'] = 'Betaal met Przelewy24';
+$_GATEWAYLANG['payWithApplepay'] = 'Betaal met Apple Pay';

src/mollie/lang/english.php

@@ -3,7 +3,6 @@
 $_GATEWAYLANG = array();
 
 $_GATEWAYLANG['selectBank'] = 'Select bank';
-$_GATEWAYLANG['selectLater'] = 'Select later';
 
 $_GATEWAYLANG['errorTransactionNotFound'] = 'Transaction is not found. Please try again.';
 
@@ -11,7 +10,6 @@ $_GATEWAYLANG['checkPayment'] = 'Checking your payment, please wait...';
 
 $_GATEWAYLANG['payWithBanktransfer'] = 'Pay with Bank Transfer';
 $_GATEWAYLANG['payWithBelfius'] = 'Pay with Belfius';
-$_GATEWAYLANG['payWithBitcoin'] = 'Pay with Bitcoin';
 $_GATEWAYLANG['payWithCreditcard'] = 'Pay with Credit Card';
 $_GATEWAYLANG['payWithIdeal'] = 'Pay with iDeal';
 $_GATEWAYLANG['payWithBancontact'] = 'Pay with Bancontact';
@@ -23,3 +21,5 @@ $_GATEWAYLANG['payWithGiftcard'] = 'Pay with a gift card';
 $_GATEWAYLANG['payWithGiropay'] = 'Pay with Giropay';
 $_GATEWAYLANG['payWithInghomepay'] = 'Pay with ING Home\'Pay';
 $_GATEWAYLANG['payWithKbc'] = 'Pay with KBC/CBC Payment Button';
+$_GATEWAYLANG['payWithPrzelewy24'] = 'Pay with Przelewy24';
+$_GATEWAYLANG['payWithApplepay'] = 'Pay with Apple Pay';

src/mollie/mollie.php

@@ -71,7 +71,7 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL)
             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)) {
+        if (isset($_POST['start']) || isset($_POST['issuer']) || (isset($_GET['a']) && $_GET['a'] == 'complete') || (isset($_GET['action']) && ($_GET['action'] == 'addfunds' || $_GET['action'] == 'masspay') && isset($_POST['paymentmethod']) && $_POST['paymentmethod'] == 'mollie' . $method)) {
 
             $transactionCurrency = select_query('tblcurrencies', '', array('code' => $params['currency']), null, null, 1);
             $transactionCurrency = mysql_fetch_assoc($transactionCurrency);
@@ -93,7 +93,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'],
                 ),
@@ -105,7 +105,7 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL)
             header('Location: ' . $payment->getCheckoutUrl());
             exit();
         } else {
-            $return = '<form action="" method="POST">';
+            $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;

src/mollieapplepay_devapp.php

@@ -2,21 +2,21 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function molliebitcoin_devapp_config()
+function mollieapplepay_devapp_config()
 {
     $config = mollie_config();
 
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Bitcoin'
+            'Value' => 'Mollie Apple Pay'
         )
     ));
 
     return $config;
 }
 
-function molliebitcoin_devapp_link($params)
+function mollieapplepay_devapp_link($params)
 {
-    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BITCOIN);
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::APPLEPAY);
 }