Merge pull request #24 from qarizma/master

Fixed slash in SystemURL parameter
This commit is contained in:
Wouter van Os
2017-06-05 18:18:59 +02:00
committed by GitHub

View File

@@ -66,7 +66,7 @@ function mollie_link($params, $method = Mollie_API_Object_Method::IDEAL) {
header('location: ' . $params['returnurl'] . '&paymentfailed=true'); header('location: ' . $params['returnurl'] . '&paymentfailed=true');
exit(); exit();
} else { } 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 { } 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($_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, 'method' => $method,
'description' => $params['description'], 'description' => $params['description'],
'redirectUrl' => $params['returnurl'] . '&check_payment=' . $transactionId, 'redirectUrl' => $params['returnurl'] . '&check_payment=' . $transactionId,
'webhookUrl' => $params['systemurl'] . '/modules/gateways/mollie/callback.php', 'webhookUrl' => $params['systemurl'] . 'modules/gateways/mollie/callback.php',
'metadata' => array( 'metadata' => array(
'invoice_id' => $params['invoiceid'], 'invoice_id' => $params['invoiceid'],
), ),