From 135bd47bd6669a317cb3ee1cef36b7145abbe36e Mon Sep 17 00:00:00 2001
From: "daan.rijpkema" <daan.rijpkema@coolblue.nl>
Date: Thu, 10 Oct 2024 13:09:43 +0200
Subject: [PATCH] More optimizations

---
 bluem-idin.php                                |    4 +-
 bluem-integrations.php                        | 2388 +++++++++--------
 bluem-payments.php                            |    4 +-
 gateways/Bluem_Bank_Based_Payment_Gateway.php |    2 +-
 gateways/Bluem_Mandates_Payment_Gateway.php   |   19 +-
 src/Observability/BluemActivationNotifier.php |  193 +-
 views/home.php                                |   20 +-
 views/importexport.php                        |   14 +-
 views/request.php                             |   23 +-
 views/requests.php                            |    6 +-
 10 files changed, 1344 insertions(+), 1329 deletions(-)

diff --git a/bluem-idin.php b/bluem-idin.php
index 347abee..ce05982 100644
--- a/bluem-idin.php
+++ b/bluem-idin.php
@@ -1638,8 +1638,8 @@ function bluem_get_IDINDescription_replaces(): array
         $current_user->display_name ?? '',    // '{gebruikersnaam}',
         $current_user->user_email ?? '',      // '{email}',
         (string)($current_user->ID ?? ''),    // {klantnummer}
-        date('d-m-Y'),                        // '{datum}',
-        date('d-m-Y H:i'),                     // '{datumtijd}',
+        gmdate('d-m-Y'),                        // '{datum}',
+        gmdate('d-m-Y H:i'),                     // '{datumtijd}',
     );
 }
 
diff --git a/bluem-integrations.php b/bluem-integrations.php
index 3d126eb..f70f203 100644
--- a/bluem-integrations.php
+++ b/bluem-integrations.php
@@ -1,89 +1,96 @@
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+if (!defined('ABSPATH')) {
+    exit;
 }
 
 use Bluem\BluemPHP\Bluem;
 
-function bluem_woocommerce_integrations_settings_section() {
-	echo '<p><a id="tab_integrations"></a></p>';
+function bluem_woocommerce_integrations_settings_section()
+{
+    echo '<p><a id="tab_integrations"></a></p>';
 }
 
-function bluem_woocommerce_get_integration_option( $key ) {
-	$options = bluem_woocommerce_get_integrations_options();
-	if ( array_key_exists( $key, $options ) ) {
-		return $options[ $key ];
-	}
+function bluem_woocommerce_get_integration_option($key)
+{
+    $options = bluem_woocommerce_get_integrations_options();
+    if (array_key_exists($key, $options)) {
+        return $options[$key];
+    }
 
-	return false;
+    return false;
 }
 
-function bluem_woocommerce_get_integrations_options() {
-	return array(
-		'gformActive'     => array(
-			'key'         => 'gformActive',
-			'title'       => 'bluem_gformActive',
-			'name'        => 'Gravity Forms',
-			'description' => 'Activeer de Gravity Forms integratie',
-			'type'        => 'select',
-			'default'     => 'N',
-			'options'     => array(
-				'N' => 'Niet actief',
-				'Y' => 'Actief',
-			),
-		),
-		'gformResultpage' => array(
-			'key'         => 'gformResultpage',
-			'title'       => 'bluem_gformResultpage',
-			'name'        => 'Slug resultaatpagina',
-			'description' => 'De slug van de resultaatpagina',
-			'default'     => '',
-		),
-		'wpcf7Active'     => array(
-			'key'         => 'wpcf7Active',
-			'title'       => 'bluem_wpcf7Active',
-			'name'        => 'ContactForm 7',
-			'description' => 'Activeer de ContactForm 7 integratie',
-			'type'        => 'select',
-			'default'     => 'N',
-			'options'     => array(
-				'N' => 'Niet actief',
-				'Y' => 'Actief',
-			),
-		),
-		'wpcf7Resultpage' => array(
-			'key'         => 'wpcf7Resultpage',
-			'title'       => 'bluem_wpcf7Resultpage',
-			'name'        => 'Slug resultaatpagina',
-			'description' => 'De slug van de resultaatpagina',
-			'default'     => '',
-		),
-	);
+function bluem_woocommerce_get_integrations_options()
+{
+    return array(
+        'gformActive' => array(
+            'key' => 'gformActive',
+            'title' => 'bluem_gformActive',
+            'name' => 'Gravity Forms',
+            'description' => 'Activeer de Gravity Forms integratie',
+            'type' => 'select',
+            'default' => 'N',
+            'options' => array(
+                'N' => 'Niet actief',
+                'Y' => 'Actief',
+            ),
+        ),
+        'gformResultpage' => array(
+            'key' => 'gformResultpage',
+            'title' => 'bluem_gformResultpage',
+            'name' => 'Slug resultaatpagina',
+            'description' => 'De slug van de resultaatpagina',
+            'default' => '',
+        ),
+        'wpcf7Active' => array(
+            'key' => 'wpcf7Active',
+            'title' => 'bluem_wpcf7Active',
+            'name' => 'ContactForm 7',
+            'description' => 'Activeer de ContactForm 7 integratie',
+            'type' => 'select',
+            'default' => 'N',
+            'options' => array(
+                'N' => 'Niet actief',
+                'Y' => 'Actief',
+            ),
+        ),
+        'wpcf7Resultpage' => array(
+            'key' => 'wpcf7Resultpage',
+            'title' => 'bluem_wpcf7Resultpage',
+            'name' => 'Slug resultaatpagina',
+            'description' => 'De slug van de resultaatpagina',
+            'default' => '',
+        ),
+    );
 }
 
-function bluem_woocommerce_settings_render_gformActive() {
-	bluem_woocommerce_settings_render_input(
-		bluem_woocommerce_get_integration_option( 'gformActive' )
-	);
+function bluem_woocommerce_settings_render_gformActive()
+{
+    bluem_woocommerce_settings_render_input(
+        bluem_woocommerce_get_integration_option('gformActive')
+    );
 }
 
-function bluem_woocommerce_settings_render_gformResultpage() {
-	bluem_woocommerce_settings_render_input(
-		bluem_woocommerce_get_integration_option( 'gformResultpage' )
-	);
+function bluem_woocommerce_settings_render_gformResultpage()
+{
+    bluem_woocommerce_settings_render_input(
+        bluem_woocommerce_get_integration_option('gformResultpage')
+    );
 }
 
-function bluem_woocommerce_settings_render_wpcf7Active() {
-	bluem_woocommerce_settings_render_input(
-		bluem_woocommerce_get_integration_option( 'wpcf7Active' )
-	);
+function bluem_woocommerce_settings_render_wpcf7Active()
+{
+    bluem_woocommerce_settings_render_input(
+        bluem_woocommerce_get_integration_option('wpcf7Active')
+    );
 }
 
-function bluem_woocommerce_settings_render_wpcf7Resultpage() {
-	bluem_woocommerce_settings_render_input(
-		bluem_woocommerce_get_integration_option( 'wpcf7Resultpage' )
-	);
+function bluem_woocommerce_settings_render_wpcf7Resultpage()
+{
+    bluem_woocommerce_settings_render_input(
+        bluem_woocommerce_get_integration_option('wpcf7Resultpage')
+    );
 }
 
 /**
@@ -91,16 +98,17 @@ function bluem_woocommerce_settings_render_wpcf7Resultpage() {
  *
  * Javascript code in footer.
  */
-add_action( 'wp_footer', 'bluem_woocommerce_integration_wpcf7_javascript' );
+add_action('wp_footer', 'bluem_woocommerce_integration_wpcf7_javascript');
 
-function bluem_woocommerce_integration_wpcf7_javascript() {
-	$bluem_config = bluem_woocommerce_get_config();
+function bluem_woocommerce_integration_wpcf7_javascript()
+{
+    $bluem_config = bluem_woocommerce_get_config();
 
-	if ( $bluem_config->wpcf7Active !== 'Y' ) {
-		return;
-	}
+    if ($bluem_config->wpcf7Active !== 'Y') {
+        return;
+    }
 
-	echo '
+    echo '
     <script>
 
     document.addEventListener( "wpcf7submit", function ( event ) {
@@ -108,7 +116,7 @@ function bluem_woocommerce_integration_wpcf7_javascript() {
     }, false );
 
     document.addEventListener( "wpcf7mailsent", function ( event ) {
-        const url = "' . home_url( 'bluem-woocommerce/bluem-integrations/wpcf7_mandate' ) . '"
+        const url = "' . esc_url(home_url('bluem-woocommerce/bluem-integrations/wpcf7_mandate')) . '"
 
         var contact_form_id = event.detail.contactFormId;
         var inputs = event.detail.inputs;
@@ -145,16 +153,17 @@ function bluem_woocommerce_integration_wpcf7_javascript() {
  *
  * Javascript code in footer.
  */
-add_action( 'wp_footer', 'bluem_woocommerce_integration_gform_javascript' );
+add_action('wp_footer', 'bluem_woocommerce_integration_gform_javascript');
 
-function bluem_woocommerce_integration_gform_javascript() {
-	$bluem_config = bluem_woocommerce_get_config();
+function bluem_woocommerce_integration_gform_javascript()
+{
+    $bluem_config = bluem_woocommerce_get_config();
 
-	if ( $bluem_config->gformActive !== 'Y' ) {
-		return;
-	}
+    if ($bluem_config->gformActive !== 'Y') {
+        return;
+    }
 
-	echo '
+    echo '
     <script>
 
     document.addEventListener( "gform_confirmation_loaded", function ( event ) {
@@ -174,1202 +183,1209 @@ function bluem_woocommerce_integration_gform_javascript() {
  * ContactForm 7 integration.
  * AJAX Form submissions.
  */
-add_action( 'parse_request', 'bluem_woocommerce_integration_wpcf7_ajax' );
+add_action('parse_request', 'bluem_woocommerce_integration_wpcf7_ajax');
 
-function bluem_woocommerce_integration_wpcf7_ajax() {
-	$bluem_config = bluem_woocommerce_get_config();
+function bluem_woocommerce_integration_wpcf7_ajax()
+{
+    $bluem_config = bluem_woocommerce_get_config();
 
-	if ( strpos( sanitize_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'bluem-woocommerce/bluem-integrations/wpcf7_mandate' ) === false ) {
-		return;
-	}
+    if (strpos(sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])), 'bluem-woocommerce/bluem-integrations/wpcf7_mandate') === false) {
+        return;
+    }
 
-	$bluem_mandate_approve = ! empty( $_POST['bluem_mandate_approve'] ) ? sanitize_text_field( wp_unslash( $_POST['bluem_mandate_approve'] ) ) : '';
+    $bluem_mandate_approve = !empty($_POST['bluem_mandate_approve']) ? sanitize_text_field(wp_unslash($_POST['bluem_mandate_approve'])) : '';
 
-	if ( $bluem_config->wpcf7Active !== 'Y' || empty( $bluem_mandate_approve ) ) {
-		return;
-	}
+    if ($bluem_config->wpcf7Active !== 'Y' || empty($bluem_mandate_approve)) {
+        return;
+    }
 
-	if ( $_SERVER['REQUEST_METHOD'] === 'POST' ) {
-		$bluem_config = bluem_woocommerce_get_config();
+    if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+        $bluem_config = bluem_woocommerce_get_config();
 
-		$debtorReference = bin2hex( random_bytes( 15 ) );
+        $debtorReference = bin2hex(random_bytes(15));
 
-		if ( ! empty( $debtorReference ) ) {
-			$debtorReference = sanitize_text_field( $debtorReference );
+        if (!empty($debtorReference)) {
+            $debtorReference = sanitize_text_field($debtorReference);
 
-			$db_results = bluem_db_get_requests_by_keyvalues(
-				array(
-					'debtor_reference' => $debtorReference,
-					'status'           => 'Success',
-				)
-			);
+            $db_results = bluem_db_get_requests_by_keyvalues(
+                array(
+                    'debtor_reference' => $debtorReference,
+                    'status' => 'Success',
+                )
+            );
 
-			$contact_form_id = ! empty( $_POST['contact_form_id'] ) ? sanitize_text_field( $_POST['contact_form_id'] ) : '';
+            $contact_form_id = !empty($_POST['contact_form_id']) ? sanitize_text_field($_POST['contact_form_id']) : '';
 
-			$posted_data = array();
-			// @todo: change this to only retrieve the fields relevant for the form
-			// $form = get_post_meta($contact_form_id, '_form', true);
-			// var_dump($form);
-			foreach ( $_POST as $key => $value ) {
-				if ( $key !== 'contact_form_id' ) {
-					$posted_data[ sanitize_text_field( $key ) ] = sanitize_text_field( $value );
-				}
-			}
-
-			// Check the sequence type or previous success results
-			if ( $bluem_config->sequenceType === 'OOFF' || sizeof( $db_results ) == 0 ) {
-				$bluem_config->merchantReturnURLBase = home_url(
-					'bluem-woocommerce/bluem-integrations/wpcf7_callback'
-				);
-
-				$preferences = get_option( 'bluem_woocommerce_options' );
+            $posted_data = array();
+            // @todo: change this to only retrieve the fields relevant for the form
+            // $form = get_post_meta($contact_form_id, '_form', true);
+            // var_dump($form);
+            foreach ($_POST as $key => $value) {
+                if ($key !== 'contact_form_id') {
+                    $posted_data[sanitize_text_field($key)] = sanitize_text_field($value);
+                }
+            }
 
-				// Convert UTF-8 to ISO
-				// if (!empty($bluem_mandate_reason)) {
-				// $bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
-				// } else
-				if ( ! empty( $bluem_config->eMandateReason ) ) {
-					$bluem_config->eMandateReason = mb_convert_encoding( $bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8' );
-				} else {
-					$bluem_config->eMandateReason = 'Incasso machtiging ' . $debtorReference;
-				}
+            // Check the sequence type or previous success results
+            if ($bluem_config->sequenceType === 'OOFF' || sizeof($db_results) == 0) {
+                $bluem_config->merchantReturnURLBase = home_url(
+                    'bluem-woocommerce/bluem-integrations/wpcf7_callback'
+                );
+
+                $preferences = get_option('bluem_woocommerce_options');
+
+                // Convert UTF-8 to ISO
+                // if (!empty($bluem_mandate_reason)) {
+                // $bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
+                // } else
+                if (!empty($bluem_config->eMandateReason)) {
+                    $bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
+                } else {
+                    $bluem_config->eMandateReason = 'Incasso machtiging ' . $debtorReference;
+                }
 
-				$bluem = new Bluem( $bluem_config );
+                $bluem = new Bluem($bluem_config);
 
-				$mandate_id_counter = get_option( 'bluem_woocommerce_mandate_id_counter' );
+                $mandate_id_counter = get_option('bluem_woocommerce_mandate_id_counter');
 
-				if ( ! isset( $mandate_id_counter ) ) {
-					$mandate_id_counter = $preferences['mandate_id_counter'];
-				}
+                if (!isset($mandate_id_counter)) {
+                    $mandate_id_counter = $preferences['mandate_id_counter'];
+                }
 
-				$mandate_id = $mandate_id_counter + 1;
+                $mandate_id = $mandate_id_counter + 1;
 
-				update_option( 'bluem_woocommerce_mandate_id_counter', $mandate_id );
+                update_option('bluem_woocommerce_mandate_id_counter', $mandate_id);
 
-				$request = $bluem->CreateMandateRequest(
-					$debtorReference,
-					$debtorReference,
-					$mandate_id
-				);
+                $request = $bluem->CreateMandateRequest(
+                    $debtorReference,
+                    $debtorReference,
+                    $mandate_id
+                );
 
-				// Actually perform the request.
-				try {
-					$response = $bluem->PerformRequest( $request );
+                // Actually perform the request.
+                try {
+                    $response = $bluem->PerformRequest($request);
 
-					if ( ! isset( $response->EMandateTransactionResponse->TransactionURL ) ) {
-						$msg = 'Er ging iets mis bij het aanmaken van de transactie.<br>
+                    if (!isset($response->EMandateTransactionResponse->TransactionURL)) {
+                        $msg = 'Er ging iets mis bij het aanmaken van de transactie.<br>
                         Vermeld onderstaande informatie aan het websitebeheer:';
 
-						if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
-							$msg .= '<br>' .
-								$response->EMandateTransactionResponse->Error->ErrorMessage;
-						} elseif ( $response instanceof \Bluem\BluemPHP\ErrorBluemResponse ) {
-							$msg .= '<br>' .
-								$response->Error();
-						} else {
-							$msg .= '<br>Algemene fout';
-						}
-						bluem_error_report_email(
-							array(
-								'service'  => 'mandates',
-								'function' => 'shortcode_execute',
-								'message'  => $msg,
-							)
-						);
-
-						echo wp_json_encode(
-							array(
-								'success' => false,
-							)
-						);
-						die;
-					}
-
-					$mandate_id = $response->EMandateTransactionResponse->MandateID . '';
-
-					// redirect cast to string, necessary for AJAX response handling
-					$transactionURL = ( $response->EMandateTransactionResponse->TransactionURL . '' );
-
-					bluem_db_insert_storage(
-						array(
-							'bluem_mandate_transaction_id' => $mandate_id,
-							'bluem_mandate_transaction_url' => $transactionURL,
-							'bluem_integration_wpcf7_form_id' => $contact_form_id,
-							'bluem_mandate_entrance_code'  => $request->entranceCode,
-						)
-					);
-
-					$db_creation_result = bluem_db_create_request(
-						array(
-							'entrance_code'    => $request->entranceCode,
-							'transaction_id'   => $request->mandateID,
-							'transaction_url'  => $transactionURL,
-							'user_id'          => 0,
-							'timestamp'        => gmdate( 'Y-m-d H:i:s' ),
-							'description'      => 'Mandate request',
-							'debtor_reference' => $debtorReference,
-							'type'             => 'mandates',
-							'order_id'         => '',
-							'payload'          => wp_json_encode(
-								array(
-									'created_via'        => 'contactform7',
-									'environment'        => $bluem->getConfig( 'environment' ),
-									'created_mandate_id' => $mandate_id,
-									'contactform7'       => wp_json_encode(
-										array(
-											'id'      => $contact_form_id,
-											'payload' => $posted_data,
-										)
-									),
-								)
-							),
-						)
-					);
-
-					echo wp_json_encode(
-						array(
-							'success'      => true,
-							'redirect_uri' => esc_url( $transactionURL ),
-						)
-					);
-					die;
-				} catch ( Exception $e ) {
-					echo wp_json_encode(
-						array(
-							'success' => false,
-						)
-					);
-					die;
-				}
-			}
-		}
-	}
-
-	echo wp_json_encode(
-		array(
-			'success' => false,
-		)
-	);
-	die;
+                        if (isset($response->EMandateTransactionResponse->Error->ErrorMessage)) {
+                            $msg .= '<br>' .
+                                $response->EMandateTransactionResponse->Error->ErrorMessage;
+                        } elseif ($response instanceof \Bluem\BluemPHP\ErrorBluemResponse) {
+                            $msg .= '<br>' .
+                                $response->Error();
+                        } else {
+                            $msg .= '<br>Algemene fout';
+                        }
+                        bluem_error_report_email(
+                            array(
+                                'service' => 'mandates',
+                                'function' => 'shortcode_execute',
+                                'message' => $msg,
+                            )
+                        );
+
+                        echo wp_json_encode(
+                            array(
+                                'success' => false,
+                            )
+                        );
+                        die;
+                    }
+
+                    $mandate_id = $response->EMandateTransactionResponse->MandateID . '';
+
+                    // redirect cast to string, necessary for AJAX response handling
+                    $transactionURL = ($response->EMandateTransactionResponse->TransactionURL . '');
+
+                    bluem_db_insert_storage(
+                        array(
+                            'bluem_mandate_transaction_id' => $mandate_id,
+                            'bluem_mandate_transaction_url' => $transactionURL,
+                            'bluem_integration_wpcf7_form_id' => $contact_form_id,
+                            'bluem_mandate_entrance_code' => $request->entranceCode,
+                        )
+                    );
+
+                    $db_creation_result = bluem_db_create_request(
+                        array(
+                            'entrance_code' => $request->entranceCode,
+                            'transaction_id' => $request->mandateID,
+                            'transaction_url' => $transactionURL,
+                            'user_id' => 0,
+                            'timestamp' => gmdate('Y-m-d H:i:s'),
+                            'description' => 'Mandate request',
+                            'debtor_reference' => $debtorReference,
+                            'type' => 'mandates',
+                            'order_id' => '',
+                            'payload' => wp_json_encode(
+                                array(
+                                    'created_via' => 'contactform7',
+                                    'environment' => $bluem->getConfig('environment'),
+                                    'created_mandate_id' => $mandate_id,
+                                    'contactform7' => wp_json_encode(
+                                        array(
+                                            'id' => $contact_form_id,
+                                            'payload' => $posted_data,
+                                        )
+                                    ),
+                                )
+                            ),
+                        )
+                    );
+
+                    echo wp_json_encode(
+                        array(
+                            'success' => true,
+                            'redirect_uri' => esc_url($transactionURL),
+                        )
+                    );
+                    die;
+                } catch (Exception $e) {
+                    echo wp_json_encode(
+                        array(
+                            'success' => false,
+                        )
+                    );
+                    die;
+                }
+            }
+        }
+    }
+
+    echo wp_json_encode(
+        array(
+            'success' => false,
+        )
+    );
+    die;
 }
 
 /**
  * ContactForm 7 integration.
  * Form submissions.
  */
-add_action( 'wpcf7_submit', 'bluem_woocommerce_integration_wpcf7_submit' );
+add_action('wpcf7_submit', 'bluem_woocommerce_integration_wpcf7_submit');
 
-function bluem_woocommerce_integration_wpcf7_submit() {
-	$bluem_config = bluem_woocommerce_get_config();
+function bluem_woocommerce_integration_wpcf7_submit()
+{
+    $bluem_config = bluem_woocommerce_get_config();
 
-	if ( $bluem_config->wpcf7Active !== 'Y' ) {
-		return;
-	}
+    if ($bluem_config->wpcf7Active !== 'Y') {
+        return;
+    }
 
-	$submission = WPCF7_Submission::get_instance();
+    $submission = WPCF7_Submission::get_instance();
 
-	$contact_form = $submission->get_contact_form();
+    $contact_form = $submission->get_contact_form();
 
-	$contact_form_id = $contact_form->id();
+    $contact_form_id = $contact_form->id();
 
-	$is_bluem_mandate = $contact_form->is_true( 'bluem_mandate' );
+    $is_bluem_mandate = $contact_form->is_true('bluem_mandate');
 
-	$bluem_mandate_approve = $contact_form->pref( 'bluem_mandate_approve' );
+    $bluem_mandate_approve = $contact_form->pref('bluem_mandate_approve');
 
-	$bluem_mandate_reason = $contact_form->pref( 'bluem_mandate_reason' );
+    $bluem_mandate_reason = $contact_form->pref('bluem_mandate_reason');
 
-	/**
-	 * TODO: Add to request.
-	 * Overwrite Bluem config variable.
-	 */
-	$bluem_mandate_type = $contact_form->pref( 'bluem_mandate_type' );
+    /**
+     * TODO: Add to request.
+     * Overwrite Bluem config variable.
+     */
+    $bluem_mandate_type = $contact_form->pref('bluem_mandate_type');
 
-	$is_bluem_ajax = $contact_form->is_true( 'bluem_is_ajax' );
+    $is_bluem_ajax = $contact_form->is_true('bluem_is_ajax');
 
-	if ( $is_bluem_mandate && ! $is_bluem_ajax && ! empty( $bluem_mandate_approve ) && ! empty( $submission ) ) {
-		$posted_data = $submission->get_posted_data();
+    if ($is_bluem_mandate && !$is_bluem_ajax && !empty($bluem_mandate_approve) && !empty($submission)) {
+        $posted_data = $submission->get_posted_data();
 
-		$posted_data_hash = $submission->get_posted_data_hash();
+        $posted_data_hash = $submission->get_posted_data_hash();
 
-		$debtorReference = bin2hex( random_bytes( 15 ) );
+        $debtorReference = bin2hex(random_bytes(15));
 
-		if ( ! empty( $debtorReference ) ) {
-			$debtorReference = sanitize_text_field( $debtorReference );
+        if (!empty($debtorReference)) {
+            $debtorReference = sanitize_text_field($debtorReference);
 
-			$db_results = bluem_db_get_requests_by_keyvalues(
-				array(
-					'debtor_reference' => $debtorReference,
-					'status'           => 'Success',
-				)
-			);
+            $db_results = bluem_db_get_requests_by_keyvalues(
+                array(
+                    'debtor_reference' => $debtorReference,
+                    'status' => 'Success',
+                )
+            );
 
-			// Check the sequence type or previous success results
-			if ( $bluem_config->sequenceType === 'OOFF' || sizeof( $db_results ) == 0 ) {
-				$bluem_config->merchantReturnURLBase = home_url(
-					'bluem-woocommerce/bluem-integrations/wpcf7_callback'
-				);
+            // Check the sequence type or previous success results
+            if ($bluem_config->sequenceType === 'OOFF' || sizeof($db_results) == 0) {
+                $bluem_config->merchantReturnURLBase = home_url(
+                    'bluem-woocommerce/bluem-integrations/wpcf7_callback'
+                );
 
-				$preferences = get_option( 'bluem_woocommerce_options' );
+                $preferences = get_option('bluem_woocommerce_options');
 
-				// Convert UTF-8 to ISO
-				if ( ! empty( $bluem_mandate_reason ) ) {
-					$bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
-				} elseif ( ! empty( $bluem_config->eMandateReason ) ) {
-					$bluem_config->eMandateReason = mb_convert_encoding( $bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8' );
-				} else {
-					$bluem_config->eMandateReason = 'Incasso machtiging ' . $debtorReference;
-				}
+                // Convert UTF-8 to ISO
+                if (!empty($bluem_mandate_reason)) {
+                    $bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
+                } elseif (!empty($bluem_config->eMandateReason)) {
+                    $bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
+                } else {
+                    $bluem_config->eMandateReason = 'Incasso machtiging ' . $debtorReference;
+                }
 
-				$bluem = new Bluem( $bluem_config );
+                $bluem = new Bluem($bluem_config);
 
-				$mandate_id_counter = get_option( 'bluem_woocommerce_mandate_id_counter' );
+                $mandate_id_counter = get_option('bluem_woocommerce_mandate_id_counter');
 
-				if ( ! isset( $mandate_id_counter ) ) {
-					$mandate_id_counter = $preferences['mandate_id_counter'];
-				}
+                if (!isset($mandate_id_counter)) {
+                    $mandate_id_counter = $preferences['mandate_id_counter'];
+                }
 
-				$mandate_id = $mandate_id_counter + 1;
+                $mandate_id = $mandate_id_counter + 1;
 
-				update_option( 'bluem_woocommerce_mandate_id_counter', $mandate_id );
+                update_option('bluem_woocommerce_mandate_id_counter', $mandate_id);
 
-				$request = $bluem->CreateMandateRequest(
-					$debtorReference,
-					$debtorReference,
-					$mandate_id
-				);
+                $request = $bluem->CreateMandateRequest(
+                    $debtorReference,
+                    $debtorReference,
+                    $mandate_id
+                );
 
-				// Actually perform the request.
-				try {
-					$response = $bluem->PerformRequest( $request );
+                // Actually perform the request.
+                try {
+                    $response = $bluem->PerformRequest($request);
 
-					if ( ! isset( $response->EMandateTransactionResponse->TransactionURL ) ) {
-						$msg = 'Er ging iets mis bij het aanmaken van de transactie.<br>
+                    if (!isset($response->EMandateTransactionResponse->TransactionURL)) {
+                        $msg = 'Er ging iets mis bij het aanmaken van de transactie.<br>
                         Vermeld onderstaande informatie aan het websitebeheer:';
 
-						if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
-							$msg .= '<br>' .
-								$response->EMandateTransactionResponse->Error->ErrorMessage;
-						} elseif ( $response instanceof \Bluem\BluemPHP\ErrorBluemResponse ) {
-							$msg .= '<br>' .
-								$response->Error();
-						} else {
-							$msg .= '<br>Algemene fout';
-						}
-						bluem_error_report_email(
-							array(
-								'service'  => 'mandates',
-								'function' => 'wpcf7_execute',
-								'message'  => $msg,
-							)
-						);
-
-						bluem_dialogs_render_prompt( $msg );
-						exit;
-					}
-
-					$mandate_id = $response->EMandateTransactionResponse->MandateID . '';
-
-					// redirect cast to string, necessary for AJAX response handling
-					$transactionURL = ( $response->EMandateTransactionResponse->TransactionURL . '' );
-
-					bluem_db_insert_storage(
-						array(
-							'bluem_mandate_transaction_id' => $mandate_id,
-							'bluem_mandate_transaction_url' => $transactionURL,
-							'bluem_integration_wpcf7_form_id' => $contact_form_id,
-							'bluem_mandate_entrance_code'  => $request->entranceCode,
-						)
-					);
-
-					$db_creation_result = bluem_db_create_request(
-						array(
-							'entrance_code'    => $request->entranceCode,
-							'transaction_id'   => $request->mandateID,
-							'transaction_url'  => $transactionURL,
-							'user_id'          => 0,
-							'timestamp'        => gmdate( 'Y-m-d H:i:s' ),
-							'description'      => 'Mandate request',
-							'debtor_reference' => $debtorReference,
-							'type'             => 'mandates',
-							'order_id'         => '',
-							'payload'          => wp_json_encode(
-								array(
-									'created_via'        => 'contactform7',
-									'environment'        => $bluem->getConfig( 'environment' ),
-									'created_mandate_id' => $mandate_id,
-									'contactform7'       => wp_json_encode(
-										array(
-											'id'      => $contact_form_id,
-											'payload' => $posted_data,
-										)
-									),
-								)
-							),
-						)
-					);
-
-					if ( ob_get_length() !== false && ob_get_length() > 0 ) {
-						ob_clean();
-					}
-
-					ob_start();
-					wp_redirect( $transactionURL );
-					exit;
-				} catch ( \Exception $e ) {
-					exit( 'Error' );
-				}
-			} else {
-				wp_redirect( $bluem_config->instantMandatesResponseURI . '?result=true' );
-				exit;
-			}
-		}
-	}
+                        if (isset($response->EMandateTransactionResponse->Error->ErrorMessage)) {
+                            $msg .= '<br>' .
+                                $response->EMandateTransactionResponse->Error->ErrorMessage;
+                        } elseif ($response instanceof \Bluem\BluemPHP\ErrorBluemResponse) {
+                            $msg .= '<br>' .
+                                $response->Error();
+                        } else {
+                            $msg .= '<br>Algemene fout';
+                        }
+                        bluem_error_report_email(
+                            array(
+                                'service' => 'mandates',
+                                'function' => 'wpcf7_execute',
+                                'message' => $msg,
+                            )
+                        );
+
+                        bluem_dialogs_render_prompt($msg);
+                        exit;
+                    }
+
+                    $mandate_id = $response->EMandateTransactionResponse->MandateID . '';
+
+                    // redirect cast to string, necessary for AJAX response handling
+                    $transactionURL = ($response->EMandateTransactionResponse->TransactionURL . '');
+
+                    bluem_db_insert_storage(
+                        array(
+                            'bluem_mandate_transaction_id' => $mandate_id,
+                            'bluem_mandate_transaction_url' => $transactionURL,
+                            'bluem_integration_wpcf7_form_id' => $contact_form_id,
+                            'bluem_mandate_entrance_code' => $request->entranceCode,
+                        )
+                    );
+
+                    $db_creation_result = bluem_db_create_request(
+                        array(
+                            'entrance_code' => $request->entranceCode,
+                            'transaction_id' => $request->mandateID,
+                            'transaction_url' => $transactionURL,
+                            'user_id' => 0,
+                            'timestamp' => gmdate('Y-m-d H:i:s'),
+                            'description' => 'Mandate request',
+                            'debtor_reference' => $debtorReference,
+                            'type' => 'mandates',
+                            'order_id' => '',
+                            'payload' => wp_json_encode(
+                                array(
+                                    'created_via' => 'contactform7',
+                                    'environment' => $bluem->getConfig('environment'),
+                                    'created_mandate_id' => $mandate_id,
+                                    'contactform7' => wp_json_encode(
+                                        array(
+                                            'id' => $contact_form_id,
+                                            'payload' => $posted_data,
+                                        )
+                                    ),
+                                )
+                            ),
+                        )
+                    );
+
+                    if (ob_get_length() !== false && ob_get_length() > 0) {
+                        ob_clean();
+                    }
+
+                    ob_start();
+                    wp_redirect($transactionURL);
+                    exit;
+                } catch (\Exception $e) {
+                    exit('Error');
+                }
+            } else {
+                wp_redirect($bluem_config->instantMandatesResponseURI . '?result=true');
+                exit;
+            }
+        }
+    }
 }
 
 /**
  * ContactForm 7 integration.
  * Callback for requests.
  */
-add_action( 'parse_request', 'bluem_woocommerce_integration_wpcf7_callback' );
-
-function bluem_woocommerce_integration_wpcf7_callback() {
-	$bluem_config = bluem_woocommerce_get_config();
-
-	$storage = bluem_db_get_storage();
-
-	if ( strpos( sanitize_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'bluem-woocommerce/bluem-integrations/wpcf7_callback' ) === false ) {
-		return;
-	}
-
-	if ( $bluem_config->wpcf7Active !== 'Y' ) {
-		return;
-	}
-
-	try {
-		$bluem = new Bluem( $bluem_config );
-	} catch ( Exception $e ) {
-		// @todo: deal with incorrectly setup Bluem
-	}
-
-	$formID = $storage['bluem_integration_wpcf7_form_id'] ?? 0;
-
-	$mandateID = $storage['bluem_mandate_transaction_id'] ?? 0;
-
-	$entranceCode = $storage['bluem_mandate_entrance_code'] ?? '';
-
-	if ( empty( $mandateID ) ) {
-		if ( ! empty( $bluem_config->wpcf7Resultpage ) ) {
-			wp_redirect( home_url( $bluem_config->wpcf7Resultpage ) . "?form=$formID&result=false&reason=error" );
-			exit;
-		}
-		$errormessage = 'Fout: geen juist mandaat id teruggekregen bij callback. Neem contact op met de webshop en vermeld je contactgegevens.';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'wpcf7_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	if ( empty( $entranceCode ) ) {
-		$errormessage = 'Fout: Entrancecode is niet set; kan dus geen mandaat opvragen';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'wpcf7_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	$response = $bluem->MandateStatus( $mandateID, $entranceCode );
-
-	if ( ! $response->Status() ) {
-		$errormessage = 'Fout bij opvragen status: ' . $response->Error() . '
+add_action('parse_request', 'bluem_woocommerce_integration_wpcf7_callback');
+
+function bluem_woocommerce_integration_wpcf7_callback()
+{
+    $bluem_config = bluem_woocommerce_get_config();
+
+    $storage = bluem_db_get_storage();
+
+    if (strpos(sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])), 'bluem-woocommerce/bluem-integrations/wpcf7_callback') === false) {
+        return;
+    }
+
+    if ($bluem_config->wpcf7Active !== 'Y') {
+        return;
+    }
+
+    try {
+        $bluem = new Bluem($bluem_config);
+    } catch (Exception $e) {
+        // @todo: deal with incorrectly setup Bluem
+    }
+
+    $formID = $storage['bluem_integration_wpcf7_form_id'] ?? 0;
+
+    $mandateID = $storage['bluem_mandate_transaction_id'] ?? 0;
+
+    $entranceCode = $storage['bluem_mandate_entrance_code'] ?? '';
+
+    if (empty($mandateID)) {
+        if (!empty($bluem_config->wpcf7Resultpage)) {
+            wp_redirect(home_url($bluem_config->wpcf7Resultpage) . "?form=$formID&result=false&reason=error");
+            exit;
+        }
+        $errormessage = 'Fout: geen juist mandaat id teruggekregen bij callback. Neem contact op met de webshop en vermeld je contactgegevens.';
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'wpcf7_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    if (empty($entranceCode)) {
+        $errormessage = 'Fout: Entrancecode is niet set; kan dus geen mandaat opvragen';
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'wpcf7_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    $response = $bluem->MandateStatus($mandateID, $entranceCode);
+
+    if (!$response->Status()) {
+        $errormessage = 'Fout bij opvragen status: ' . $response->Error() . '
         <br>Neem contact op met de webshop en vermeld deze status';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'wpcf7_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-	$statusUpdateObject = $response->EMandateStatusUpdate;
-	$statusCode         = $statusUpdateObject->EMandateStatus->Status . '';
-
-	$request_from_db = bluem_db_get_request_by_transaction_id_and_type(
-		$mandateID,
-		'mandates'
-	);
-
-	if ( $statusCode !== $request_from_db->status ) {
-		bluem_db_update_request(
-			$request_from_db->id,
-			array(
-				'status' => $statusCode,
-			)
-		);
-		// also update locally for email notification
-		$request_from_db->status = $statusCode;
-	}
-
-	bluem_transaction_notification_email(
-		$request_from_db->id
-	);
-
-	// Handling the response.
-	if ( $statusCode === 'Success' ) {
-		if ( ! empty( $request_from_db->payload ) ) {
-			try {
-				$newPayload = json_decode( $request_from_db->payload );
-			} catch ( Throwable $th ) {
-				$newPayload = new Stdclass();
-			}
-		} else {
-			$newPayload = new Stdclass();
-		}
-
-		if ( isset( $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport ) ) {
-			$newPayload->purchaseID = $response->EMandateStatusUpdate->EMandateStatus->PurchaseID . '';
-			$newPayload->report     = $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport;
-
-			bluem_db_update_request(
-				$request_from_db->id,
-				array(
-					'payload' => wp_json_encode( $newPayload ),
-				)
-			);
-		}
-
-		$request_from_db = bluem_db_get_request_by_transaction_id_and_type(
-			$mandateID,
-			'mandates'
-		);
-
-		// "De ondertekening is geslaagd";
-		if ( ! empty( $bluem_config->wpcf7Resultpage ) ) {
-			wp_redirect( home_url( $bluem_config->wpcf7Resultpage ) . "?form=$formID&result=true" );
-			exit;
-		}
-		$errormessage = 'Fout: de ondertekening is geslaagd maar er is geen response URI opgegeven. Neem contact op met de website om dit technisch probleem aan te geven.';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'wpcf7_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		return;
-	}
-
-	if ( $statusCode === 'Cancelled' ) {
-		// "Je hebt de mandaat ondertekening geannuleerd";
-		if ( ! empty( $bluem_config->wpcf7Resultpage ) ) {
-			wp_redirect( home_url( $bluem_config->wpcf7Resultpage ) . "?form=$formID&result=false&reason=cancelled" );
-			exit;
-		}
-		$errormessage = 'Fout: de transactie is geannuleerd. Probeer het opnieuw.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	if ( $statusCode === 'Open' || $statusCode === 'Pending' ) {
-		// "De mandaatondertekening is nog niet bevestigd. Dit kan even duren maar gebeurt automatisch."
-		if ( ! empty( $bluem_config->wpcf7Resultpage ) ) {
-			wp_redirect( home_url( $bluem_config->wpcf7Resultpage ) . "?form=$formID&result=false&reason=open" );
-			exit;
-		}
-		$errormessage = 'Fout: de transactie staat nog open. Dit kan even duren. Vernieuw deze pagina regelmatig voor de status.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	if ( $statusCode === 'Expired' ) {
-		// "Fout: De mandaat of het verzoek daartoe is verlopen";
-		if ( ! empty( $bluem_config->wpcf7Resultpage ) ) {
-			wp_redirect( home_url( $bluem_config->wpcf7Resultpage ) . "?form=$formID&result=false&reason=expired" );
-			exit;
-		}
-		$errormessage = 'Fout: de transactie is verlopen. Probeer het opnieuw.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	bluem_error_report_email(
-		array(
-			'service'  => 'mandates',
-			'function' => 'wpcf7_callback',
-			'message'  => "Fout: Onbekende of foutieve status teruggekregen: $statusCode<br>Neem contact op met de webshop en vermeld deze status; gebruiker wel doorverwezen terug naar site",
-		)
-	);
-
-	if ( ! empty( $bluem_config->wpcf7Resultpage ) ) {
-		wp_redirect( home_url( $bluem_config->wpcf7Resultpage ) . "?form=$formID&result=false&reason=error" );
-		exit;
-	}
-	$errormessage = 'Fout: er is een onbekende fout opgetreden. Probeer het opnieuw.';
-	bluem_dialogs_render_prompt( $errormessage );
-	exit;
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'wpcf7_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+    $statusUpdateObject = $response->EMandateStatusUpdate;
+    $statusCode = $statusUpdateObject->EMandateStatus->Status . '';
+
+    $request_from_db = bluem_db_get_request_by_transaction_id_and_type(
+        $mandateID,
+        'mandates'
+    );
+
+    if ($statusCode !== $request_from_db->status) {
+        bluem_db_update_request(
+            $request_from_db->id,
+            array(
+                'status' => $statusCode,
+            )
+        );
+        // also update locally for email notification
+        $request_from_db->status = $statusCode;
+    }
+
+    bluem_transaction_notification_email(
+        $request_from_db->id
+    );
+
+    // Handling the response.
+    if ($statusCode === 'Success') {
+        if (!empty($request_from_db->payload)) {
+            try {
+                $newPayload = json_decode($request_from_db->payload);
+            } catch (Throwable $th) {
+                $newPayload = new Stdclass();
+            }
+        } else {
+            $newPayload = new Stdclass();
+        }
+
+        if (isset($response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport)) {
+            $newPayload->purchaseID = $response->EMandateStatusUpdate->EMandateStatus->PurchaseID . '';
+            $newPayload->report = $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport;
+
+            bluem_db_update_request(
+                $request_from_db->id,
+                array(
+                    'payload' => wp_json_encode($newPayload),
+                )
+            );
+        }
+
+        $request_from_db = bluem_db_get_request_by_transaction_id_and_type(
+            $mandateID,
+            'mandates'
+        );
+
+        // "De ondertekening is geslaagd";
+        if (!empty($bluem_config->wpcf7Resultpage)) {
+            wp_redirect(home_url($bluem_config->wpcf7Resultpage) . "?form=$formID&result=true");
+            exit;
+        }
+        $errormessage = 'Fout: de ondertekening is geslaagd maar er is geen response URI opgegeven. Neem contact op met de website om dit technisch probleem aan te geven.';
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'wpcf7_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        return;
+    }
+
+    if ($statusCode === 'Cancelled') {
+        // "Je hebt de mandaat ondertekening geannuleerd";
+        if (!empty($bluem_config->wpcf7Resultpage)) {
+            wp_redirect(home_url($bluem_config->wpcf7Resultpage) . "?form=$formID&result=false&reason=cancelled");
+            exit;
+        }
+        $errormessage = 'Fout: de transactie is geannuleerd. Probeer het opnieuw.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    if ($statusCode === 'Open' || $statusCode === 'Pending') {
+        // "De mandaatondertekening is nog niet bevestigd. Dit kan even duren maar gebeurt automatisch."
+        if (!empty($bluem_config->wpcf7Resultpage)) {
+            wp_redirect(home_url($bluem_config->wpcf7Resultpage) . "?form=$formID&result=false&reason=open");
+            exit;
+        }
+        $errormessage = 'Fout: de transactie staat nog open. Dit kan even duren. Vernieuw deze pagina regelmatig voor de status.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    if ($statusCode === 'Expired') {
+        // "Fout: De mandaat of het verzoek daartoe is verlopen";
+        if (!empty($bluem_config->wpcf7Resultpage)) {
+            wp_redirect(home_url($bluem_config->wpcf7Resultpage) . "?form=$formID&result=false&reason=expired");
+            exit;
+        }
+        $errormessage = 'Fout: de transactie is verlopen. Probeer het opnieuw.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    bluem_error_report_email(
+        array(
+            'service' => 'mandates',
+            'function' => 'wpcf7_callback',
+            'message' => "Fout: Onbekende of foutieve status teruggekregen: $statusCode<br>Neem contact op met de webshop en vermeld deze status; gebruiker wel doorverwezen terug naar site",
+        )
+    );
+
+    if (!empty($bluem_config->wpcf7Resultpage)) {
+        wp_redirect(home_url($bluem_config->wpcf7Resultpage) . "?form=$formID&result=false&reason=error");
+        exit;
+    }
+    $errormessage = 'Fout: er is een onbekende fout opgetreden. Probeer het opnieuw.';
+    bluem_dialogs_render_prompt($errormessage);
+    exit;
 }
 
 /**
  * ContactForm 7 integration.
  * Shortcode to display results.
  */
-add_shortcode( 'bluem_resultaatpagina', 'bluem_woocommerce_integration_wpcf7_results_shortcode' );
-add_shortcode( 'bluem_wpcf7_results', 'bluem_woocommerce_integration_wpcf7_results_shortcode' );
+add_shortcode('bluem_resultaatpagina', 'bluem_woocommerce_integration_wpcf7_results_shortcode');
+add_shortcode('bluem_wpcf7_results', 'bluem_woocommerce_integration_wpcf7_results_shortcode');
 
-function bluem_woocommerce_integration_wpcf7_results_shortcode() {
-	$bluem_config = bluem_woocommerce_get_config();
+function bluem_woocommerce_integration_wpcf7_results_shortcode()
+{
+    $bluem_config = bluem_woocommerce_get_config();
 
-	if ( $bluem_config->wpcf7Active !== 'Y' ) {
-		return '';
-	}
+    if ($bluem_config->wpcf7Active !== 'Y') {
+        return '';
+    }
 
-	if ( empty( $_GET['form'] ) || empty( $_GET['result'] ) ) {
-		return 'Er is een fout opgetreden. Ga terug en probeer het opnieuw.';
-	}
+    if (empty($_GET['form']) || empty($_GET['result'])) {
+        return 'Er is een fout opgetreden. Ga terug en probeer het opnieuw.';
+    }
 
-	$contact_form = WPCF7_ContactForm::get_instance( sanitize_text_field( $_GET['form'] ) );
+    $contact_form = WPCF7_ContactForm::get_instance(sanitize_text_field($_GET['form']));
 
-	if ( ! empty( $contact_form ) ) {
-		if ( ! empty( $_GET['result'] ) && $_GET['result'] === 'true' ) {
-			return '<p>' . $contact_form->pref( 'bluem_mandate_success' ) . '</p>';
-		}
-	}
-	return '<p>' . $contact_form->pref( 'bluem_mandate_failure' ) . '</p>';
+    if (!empty($contact_form)) {
+        if (!empty($_GET['result']) && $_GET['result'] === 'true') {
+            return '<p>' . $contact_form->pref('bluem_mandate_success') . '</p>';
+        }
+    }
+    return '<p>' . $contact_form->pref('bluem_mandate_failure') . '</p>';
 }
 
 /**
  * Gravity Forms integration.
  * Hook for submissions.
  */
-add_action( 'gform_after_submission', 'bluem_woocommerce_integration_gform_submit', 10, 2 );
-
-function bluem_woocommerce_integration_gform_submit( $entry, $form ) {
-	$bluem_config = bluem_woocommerce_get_config();
-
-	if ( $bluem_config->gformActive !== 'Y' ) {
-		return;
-	}
-
-	/**
-	 * Define form data.
-	 */
-	$form_data = array();
-
-	// Loop through fields
-	foreach ( $form['fields'] as $field ) {
-		$inputs = $field->get_entry_inputs();
-		if ( is_array( $inputs ) ) {
-			foreach ( $inputs as $input ) {
-				$value = rgar( $entry, (string) $input['id'] );
-			}
-		} else {
-			$value = rgar( $entry, (string) $field->id );
-
-			if ( empty( $value ) ) {
-				$value = $field->defaultValue;
-			}
-		}
-
-		if ( ! empty( $field->inputName ) && ! empty( $value ) && strpos( $field->inputName, 'bluem_' ) === 0 ) {
-			// echo " set $value for input {$field->inputName}";
-			$form_data[ $field->inputName ] = $value;
-		}
-
-		if ( ! empty( $field->label ) && ! empty( $value ) && strpos( $field->label, 'bluem_' ) === 0 ) {
-			// echo " set $value for label {$field->label}";
-			$form_data[ $field->label ] = $value;
-		}
-	}
-
-	// Get custom parameters for this form
-	$bluem_mandate         = $form_data['bluem_mandate'] ?? null;
-	$bluem_mandate_approve = $form_data['bluem_mandate_approve'] ?? null;
-	$bluem_mandate_success = $form_data['bluem_mandate_success'] ?? null;
-	$bluem_mandate_failure = $form_data['bluem_mandate_failure'] ?? null;
-	$bluem_mandate_reason  = $form_data['bluem_mandate_reason'] ?? null;
-	$bluem_mandate_type    = $form_data['bluem_mandate_type'] ?? null;
-
-	$bluem_is_ajax = $form_data['bluem_is_ajax'] ?? null;
-
-	/**
-	 * Define payload for Bluem.
-	 */
-	$payload = array(
-		'source_url' => $entry['source_url'],
-		'form_id'    => $entry['form_id'],
-		'entry_id'   => $entry['id'],
-		'ip'         => $entry['ip'],
-	);
-
-	/**
-	 * Do mandate request.
-	 */
-	if ( $bluem_mandate === 'true' && $bluem_mandate_approve === 'true' ) {
-		$debtorReference = bin2hex( random_bytes( 15 ) );
-
-		if ( empty( $debtorReference ) ) {
-			return;
-		}
-
-		// Define debtor reference
-		$debtorReference = sanitize_text_field( $debtorReference );
-
-		// Get previous requests by debtor reference
-		$db_results = bluem_db_get_requests_by_keyvalues(
-			array(
-				'debtor_reference' => $debtorReference,
-				'status'           => 'Success',
-			)
-		);
-
-		// Check for mandate type
-		if ( ! empty( $bluem_mandate_type ) ) {
-			$bluem_config->sequenceType = $bluem_mandate_type;
-		}
-
-		// Check the sequence type or previous success results
-		if ( $bluem_config->sequenceType === 'OOFF' || sizeof( $db_results ) == 0 ) {
-			$bluem_config->merchantReturnURLBase = home_url(
-				'bluem-woocommerce/bluem-integrations/gform_callback'
-			);
-
-			$preferences = get_option( 'bluem_woocommerce_options' );
-
-			// Convert UTF-8 to ISO
-			if ( ! empty( $bluem_mandate_reason ) ) {
-				$bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
-			} elseif ( ! empty( $bluem_config->eMandateReason ) ) {
-				$bluem_config->eMandateReason = mb_convert_encoding( $bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8' );
-			} else {
-				$bluem_config->eMandateReason = 'Incasso machtiging ' . $debtorReference;
-			}
-
-			try {
-				$bluem = new Bluem( $bluem_config );
-			} catch ( Exception $e ) {
-				echo( 'Kon gravity form niet goed uitvoeren; check je instellingen' );
-				die();
-			}
-
-			$mandate_id_counter = get_option( 'bluem_woocommerce_mandate_id_counter' );
-
-			if ( ! isset( $mandate_id_counter ) ) {
-				$mandate_id_counter = $preferences['mandate_id_counter'];
-			}
-
-			$mandate_id = $mandate_id_counter + 1;
-
-			update_option( 'bluem_woocommerce_mandate_id_counter', $mandate_id );
-
-			try {
-				$request = $bluem->CreateMandateRequest(
-					$debtorReference,
-					$debtorReference,
-					$mandate_id
-				);
-
-				// Actually perform the request.
-
-				$response = $bluem->PerformRequest( $request );
-
-				if ( ! isset( $response->EMandateTransactionResponse->TransactionURL ) ) {
-					$msg = 'Er ging iets mis bij het aanmaken van de transactie.<br>
+add_action('gform_after_submission', 'bluem_woocommerce_integration_gform_submit', 10, 2);
+
+function bluem_woocommerce_integration_gform_submit($entry, $form)
+{
+    $bluem_config = bluem_woocommerce_get_config();
+
+    if ($bluem_config->gformActive !== 'Y') {
+        return;
+    }
+
+    /**
+     * Define form data.
+     */
+    $form_data = array();
+
+    // Loop through fields
+    foreach ($form['fields'] as $field) {
+        $inputs = $field->get_entry_inputs();
+        if (is_array($inputs)) {
+            foreach ($inputs as $input) {
+                $value = rgar($entry, (string)$input['id']);
+            }
+        } else {
+            $value = rgar($entry, (string)$field->id);
+
+            if (empty($value)) {
+                $value = $field->defaultValue;
+            }
+        }
+
+        if (!empty($field->inputName) && !empty($value) && strpos($field->inputName, 'bluem_') === 0) {
+            // echo " set $value for input {$field->inputName}";
+            $form_data[$field->inputName] = $value;
+        }
+
+        if (!empty($field->label) && !empty($value) && strpos($field->label, 'bluem_') === 0) {
+            // echo " set $value for label {$field->label}";
+            $form_data[$field->label] = $value;
+        }
+    }
+
+    // Get custom parameters for this form
+    $bluem_mandate = $form_data['bluem_mandate'] ?? null;
+    $bluem_mandate_approve = $form_data['bluem_mandate_approve'] ?? null;
+    $bluem_mandate_success = $form_data['bluem_mandate_success'] ?? null;
+    $bluem_mandate_failure = $form_data['bluem_mandate_failure'] ?? null;
+    $bluem_mandate_reason = $form_data['bluem_mandate_reason'] ?? null;
+    $bluem_mandate_type = $form_data['bluem_mandate_type'] ?? null;
+
+    $bluem_is_ajax = $form_data['bluem_is_ajax'] ?? null;
+
+    /**
+     * Define payload for Bluem.
+     */
+    $payload = array(
+        'source_url' => $entry['source_url'],
+        'form_id' => $entry['form_id'],
+        'entry_id' => $entry['id'],
+        'ip' => $entry['ip'],
+    );
+
+    /**
+     * Do mandate request.
+     */
+    if ($bluem_mandate === 'true' && $bluem_mandate_approve === 'true') {
+        $debtorReference = bin2hex(random_bytes(15));
+
+        if (empty($debtorReference)) {
+            return;
+        }
+
+        // Define debtor reference
+        $debtorReference = sanitize_text_field($debtorReference);
+
+        // Get previous requests by debtor reference
+        $db_results = bluem_db_get_requests_by_keyvalues(
+            array(
+                'debtor_reference' => $debtorReference,
+                'status' => 'Success',
+            )
+        );
+
+        // Check for mandate type
+        if (!empty($bluem_mandate_type)) {
+            $bluem_config->sequenceType = $bluem_mandate_type;
+        }
+
+        // Check the sequence type or previous success results
+        if ($bluem_config->sequenceType === 'OOFF' || sizeof($db_results) == 0) {
+            $bluem_config->merchantReturnURLBase = home_url(
+                'bluem-woocommerce/bluem-integrations/gform_callback'
+            );
+
+            $preferences = get_option('bluem_woocommerce_options');
+
+            // Convert UTF-8 to ISO
+            if (!empty($bluem_mandate_reason)) {
+                $bluem_config->eMandateReason = $bluem_mandate_reason . ' (' . $debtorReference . ')';
+            } elseif (!empty($bluem_config->eMandateReason)) {
+                $bluem_config->eMandateReason = mb_convert_encoding($bluem_config->eMandateReason, 'ISO-8859-1', 'UTF-8');
+            } else {
+                $bluem_config->eMandateReason = 'Incasso machtiging ' . $debtorReference;
+            }
+
+            try {
+                $bluem = new Bluem($bluem_config);
+            } catch (Exception $e) {
+                echo('Kon gravity form niet goed uitvoeren; check je instellingen');
+                die();
+            }
+
+            $mandate_id_counter = get_option('bluem_woocommerce_mandate_id_counter');
+
+            if (!isset($mandate_id_counter)) {
+                $mandate_id_counter = $preferences['mandate_id_counter'];
+            }
+
+            $mandate_id = $mandate_id_counter + 1;
+
+            update_option('bluem_woocommerce_mandate_id_counter', $mandate_id);
+
+            try {
+                $request = $bluem->CreateMandateRequest(
+                    $debtorReference,
+                    $debtorReference,
+                    $mandate_id
+                );
+
+                // Actually perform the request.
+
+                $response = $bluem->PerformRequest($request);
+
+                if (!isset($response->EMandateTransactionResponse->TransactionURL)) {
+                    $msg = 'Er ging iets mis bij het aanmaken van de transactie.<br>
                     Vermeld onderstaande informatie aan het websitebeheer:';
 
-					if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
-						$msg .= '<br>' .
-							$response->EMandateTransactionResponse->Error->ErrorMessage;
-					} elseif ( get_class( $response ) === 'Bluem\BluemPHP\ErrorBluemResponse' ) {
-						$msg .= '<br>' .
-							$response->Error();
-					} else {
-						$msg .= '<br>Algemene fout';
-					}
-
-					bluem_error_report_email(
-						array(
-							'service'  => 'mandates',
-							'function' => 'gform_execute',
-							'message'  => $msg,
-						)
-					);
-
-					bluem_dialogs_render_prompt( $msg );
-					exit;
-				}
-
-				$mandate_id = $response->EMandateTransactionResponse->MandateID . '';
-
-				// redirect cast to string, necessary for AJAX response handling
-				$transactionURL = ( $response->EMandateTransactionResponse->TransactionURL . '' );
-
-				bluem_db_insert_storage(
-					array(
-						'bluem_mandate_transaction_id'     => $mandate_id,
-						'bluem_mandate_transaction_url'    => $transactionURL,
-						'bluem_integration_gform_form_id'  => $payload['form_id'],
-						'bluem_integration_gform_entry_id' => $payload['entry_id'],
-						'bluem_mandate_entrance_code'      => $request->entranceCode,
-					)
-				);
-
-				$db_creation_result = bluem_db_create_request(
-					array(
-						'entrance_code'    => $request->entranceCode,
-						'transaction_id'   => $request->mandateID,
-						'transaction_url'  => $transactionURL,
-						'user_id'          => 0,
-						'timestamp'        => gmdate( 'Y-m-d H:i:s' ),
-						'description'      => 'Mandate request',
-						'debtor_reference' => $debtorReference,
-						'type'             => 'mandates',
-						'order_id'         => '',
-						'payload'          => wp_json_encode(
-							array(
-								'created_via'        => 'gform',
-								'environment'        => $bluem->getConfig( 'environment' ),
-								'created_mandate_id' => $mandate_id,
-								'details'            => wp_json_encode(
-									array(
-										'id'      => $payload['form_id'],
-										'payload' => wp_json_encode( $payload ),
-									)
-								),
-							)
-						),
-					)
-				);
-
-				/**
-				 * Get Gravity Form entry.
-				 */
-				$entry = GFAPI::get_entry( $payload['entry_id'] );
-				if ( is_wp_error( $entry ) ) {
-					// Handle error
-				}
-
-				/**
-				 * Update Gravity Forms details.
-				 */
-				$entry['bluem_payload'] = array(
-					'mandate_id'            => $request->mandateID,
-					'mandate_entrance_code' => $request->entranceCode,
-					'bluem_record_id'       => $db_creation_result,
-				);
-
-				// Update the entry
-				$result = GFAPI::update_entry( $entry );
-
-				if ( is_wp_error( $result ) ) {
-					// Handle error
-					// var_dump( $result );
-					die();
-				} else {
-					// Entry updated successfully
-				}
-
-				if ( ob_get_length() !== false && ob_get_length() > 0 ) {
-					ob_clean();
-				}
-
-				if ( $bluem_is_ajax === 'true' ) {
-					echo wp_json_encode(
-						array(
-							'success'      => true,
-							'redirect_url' => esc_url( $transactionURL ),
-						)
-					);
-				} else {
-					ob_start();
-					wp_redirect( $transactionURL );
-				}
-				exit;
-			} catch ( Exception $e ) {
-				// var_dump($e->getMessage());
-				die();
-			}
-		}
-	}
+                    if (isset($response->EMandateTransactionResponse->Error->ErrorMessage)) {
+                        $msg .= '<br>' .
+                            $response->EMandateTransactionResponse->Error->ErrorMessage;
+                    } elseif (get_class($response) === 'Bluem\BluemPHP\ErrorBluemResponse') {
+                        $msg .= '<br>' .
+                            $response->Error();
+                    } else {
+                        $msg .= '<br>Algemene fout';
+                    }
+
+                    bluem_error_report_email(
+                        array(
+                            'service' => 'mandates',
+                            'function' => 'gform_execute',
+                            'message' => $msg,
+                        )
+                    );
+
+                    bluem_dialogs_render_prompt($msg);
+                    exit;
+                }
+
+                $mandate_id = $response->EMandateTransactionResponse->MandateID . '';
+
+                // redirect cast to string, necessary for AJAX response handling
+                $transactionURL = ($response->EMandateTransactionResponse->TransactionURL . '');
+
+                bluem_db_insert_storage(
+                    array(
+                        'bluem_mandate_transaction_id' => $mandate_id,
+                        'bluem_mandate_transaction_url' => $transactionURL,
+                        'bluem_integration_gform_form_id' => $payload['form_id'],
+                        'bluem_integration_gform_entry_id' => $payload['entry_id'],
+                        'bluem_mandate_entrance_code' => $request->entranceCode,
+                    )
+                );
+
+                $db_creation_result = bluem_db_create_request(
+                    array(
+                        'entrance_code' => $request->entranceCode,
+                        'transaction_id' => $request->mandateID,
+                        'transaction_url' => $transactionURL,
+                        'user_id' => 0,
+                        'timestamp' => gmdate('Y-m-d H:i:s'),
+                        'description' => 'Mandate request',
+                        'debtor_reference' => $debtorReference,
+                        'type' => 'mandates',
+                        'order_id' => '',
+                        'payload' => wp_json_encode(
+                            array(
+                                'created_via' => 'gform',
+                                'environment' => $bluem->getConfig('environment'),
+                                'created_mandate_id' => $mandate_id,
+                                'details' => wp_json_encode(
+                                    array(
+                                        'id' => $payload['form_id'],
+                                        'payload' => wp_json_encode($payload),
+                                    )
+                                ),
+                            )
+                        ),
+                    )
+                );
+
+                /**
+                 * Get Gravity Form entry.
+                 */
+                $entry = GFAPI::get_entry($payload['entry_id']);
+                if (is_wp_error($entry)) {
+                    // Handle error
+                }
+
+                /**
+                 * Update Gravity Forms details.
+                 */
+                $entry['bluem_payload'] = array(
+                    'mandate_id' => $request->mandateID,
+                    'mandate_entrance_code' => $request->entranceCode,
+                    'bluem_record_id' => $db_creation_result,
+                );
+
+                // Update the entry
+                $result = GFAPI::update_entry($entry);
+
+                if (is_wp_error($result)) {
+                    // Handle error
+                    // var_dump( $result );
+                    die();
+                } else {
+                    // Entry updated successfully
+                }
+
+                if (ob_get_length() !== false && ob_get_length() > 0) {
+                    ob_clean();
+                }
+
+                if ($bluem_is_ajax === 'true') {
+                    echo wp_json_encode(
+                        array(
+                            'success' => true,
+                            'redirect_url' => esc_url($transactionURL),
+                        )
+                    );
+                } else {
+                    ob_start();
+                    wp_redirect($transactionURL);
+                }
+                exit;
+            } catch (Exception $e) {
+                // var_dump($e->getMessage());
+                die();
+            }
+        }
+    }
 }
 
 /**
  * Gravity Forms integration.
  * Callback after request
  */
-add_action( 'parse_request', 'bluem_woocommerce_integration_gform_callback' );
-
-function bluem_woocommerce_integration_gform_callback() {
-	$bluem_config = bluem_woocommerce_get_config();
-
-	$storage = bluem_db_get_storage();
-
-	if ( strpos( sanitize_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'bluem-woocommerce/bluem-integrations/gform_callback' ) === false ) {
-		return;
-	}
-
-	if ( $bluem_config->gformActive !== 'Y' ) {
-		return;
-	}
-
-	try {
-		$bluem = new Bluem( $bluem_config );
-	} catch ( Exception $e ) {
-		// @todo: deal with incorrectly setup Bluem
-	}
-
-	$formID = $storage['bluem_integration_gform_form_id'] ?? 0;
-
-	$entryID = $storage['bluem_integration_gform_entry_id'] ?? 0;
-
-	$mandateID = $storage['bluem_mandate_transaction_id'] ?? 0;
-
-	$entranceCode = $storage['bluem_mandate_entrance_code'] ?? '';
-
-	if ( empty( $mandateID ) ) {
-		if ( ! empty( $bluem_config->gformResultpage ) ) {
-			wp_redirect( home_url( $bluem_config->gformResultpage ) . "?form=$formID&entry=$entryID&result=false&reason=error" );
-			exit;
-		}
-		$errormessage = 'Fout: geen juist mandaat id teruggekregen bij callback. Neem contact op met de webshop en vermeld je contactgegevens.';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'gform_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	if ( empty( $entranceCode ) ) {
-		$errormessage = 'Fout: Entrancecode is niet set; kan dus geen mandaat opvragen';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'gform_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-
-	$response = $bluem->MandateStatus( $mandateID, $entranceCode );
-
-	if ( ! $response->Status() ) {
-		$errormessage = 'Fout bij opvragen status: ' . $response->Error() . '
+add_action('parse_request', 'bluem_woocommerce_integration_gform_callback');
+
+function bluem_woocommerce_integration_gform_callback()
+{
+    $bluem_config = bluem_woocommerce_get_config();
+
+    $storage = bluem_db_get_storage();
+
+    if (strpos(sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])), 'bluem-woocommerce/bluem-integrations/gform_callback') === false) {
+        return;
+    }
+
+    if ($bluem_config->gformActive !== 'Y') {
+        return;
+    }
+
+    try {
+        $bluem = new Bluem($bluem_config);
+    } catch (Exception $e) {
+        // @todo: deal with incorrectly setup Bluem
+    }
+
+    $formID = $storage['bluem_integration_gform_form_id'] ?? 0;
+
+    $entryID = $storage['bluem_integration_gform_entry_id'] ?? 0;
+
+    $mandateID = $storage['bluem_mandate_transaction_id'] ?? 0;
+
+    $entranceCode = $storage['bluem_mandate_entrance_code'] ?? '';
+
+    if (empty($mandateID)) {
+        if (!empty($bluem_config->gformResultpage)) {
+            wp_redirect(home_url($bluem_config->gformResultpage) . "?form=$formID&entry=$entryID&result=false&reason=error");
+            exit;
+        }
+        $errormessage = 'Fout: geen juist mandaat id teruggekregen bij callback. Neem contact op met de webshop en vermeld je contactgegevens.';
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'gform_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    if (empty($entranceCode)) {
+        $errormessage = 'Fout: Entrancecode is niet set; kan dus geen mandaat opvragen';
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'gform_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+
+    $response = $bluem->MandateStatus($mandateID, $entranceCode);
+
+    if (!$response->Status()) {
+        $errormessage = 'Fout bij opvragen status: ' . $response->Error() . '
         <br>Neem contact op met de webshop en vermeld deze status';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'gform_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-	$statusUpdateObject = $response->EMandateStatusUpdate;
-	$statusCode         = $statusUpdateObject->EMandateStatus->Status . '';
-
-	$request_from_db = bluem_db_get_request_by_transaction_id_and_type(
-		$mandateID,
-		'mandates'
-	);
-
-	if ( $statusCode !== $request_from_db->status ) {
-		bluem_db_update_request(
-			$request_from_db->id,
-			array(
-				'status' => $statusCode,
-			)
-		);
-		// also update locally for email notification
-		$request_from_db->status = $statusCode;
-	}
-
-	bluem_transaction_notification_email(
-		$request_from_db->id
-	);
-
-	// Handling the response.
-	if ( $statusCode === 'Success' ) {
-		if ( ! empty( $request_from_db->payload ) ) {
-			try {
-				$newPayload = json_decode( $request_from_db->payload );
-			} catch ( Throwable $th ) {
-				$newPayload = new Stdclass();
-			}
-		} else {
-			$newPayload = new Stdclass();
-		}
-
-		if ( isset( $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport ) ) {
-			$newPayload->purchaseID = $response->EMandateStatusUpdate->EMandateStatus->PurchaseID . '';
-			$newPayload->report     = $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport;
-
-			bluem_db_update_request(
-				$request_from_db->id,
-				array(
-					'payload' => wp_json_encode( $newPayload ),
-				)
-			);
-		}
-
-		$request_from_db = bluem_db_get_request_by_transaction_id_and_type(
-			$mandateID,
-			'mandates'
-		);
-
-		if ( ! empty( $entryID ) && ! empty( $formID ) ) {
-			/**
-			 * Get the entry instance.
-			 */
-			$entry = GFAPI::get_entry( $entryID );
-
-			// Get the form instance
-			$form = GFAPI::get_form( $formID );
-
-			/**
-			 * Update Gravity Forms details.
-			 */
-			$entry['bluem_payload'] = array(
-				'mandate_id'            => ! empty( $mandateID ) ? $mandateID : '',
-				'mandate_entrance_code' => ! empty( $entranceCode ) ? $entranceCode : '',
-				'bluem_record_id'       => ! empty( $request_from_db ) ? $request_from_db->id : '',
-				'status'                => ! empty( $statusCode ) ? $statusCode : '',
-			);
-
-			// Update the entry
-			$result = GFAPI::update_entry( $entry );
-
-			/**
-			 * Define form data.
-			 */
-			$edit_data = array();
-			$form_data = array();
-
-			// Get the fields
-			$fields = $form['fields'];
-
-			// Loop through fields
-			foreach ( $fields as $field ) {
-				$field_id    = $field['id'];
-				$field_name  = $field['inputName'];
-				$field_label = $field['label'];
-				$field_value = rgar( $entry, $field_id );
-
-				if ( ! empty( $field_name ) ) {
-					$edit_data[] = array(
-						'field_id'    => $field_id,
-						'field_name'  => $field_name,
-						'field_label' => $field_label,
-						'field_value' => $field_value,
-					);
-				}
-
-				if ( ! empty( $field_label ) ) {
-					$form_data[ $field_label ] = $field_value;
-				} elseif ( ! empty( $field_id ) ) {
-					$form_data[ $field_id ] = $field_value;
-				}
-			}
-
-			// Loop through data
-			foreach ( $edit_data as $key => $value ) {
-				$newValue = '';
-
-				$payload = json_decode( json_encode( $newPayload ) );
-
-				$mandateDateTimeFormatted = '';
-				try {
-					$mandateDateTime          = new DateTimeImmutable( $payload->report->DateTime );
-					$mandateDateTimeFormatted = $mandateDateTime->format( 'd-m-Y H:i' );
-				} catch ( Exception $e ) {
-				}
-
-				if ( $value['field_name'] === 'bluem_mandate_accountname' ) {
-					$newValue = $payload->report->DebtorAccountName;
-				} elseif ( $value['field_name'] === 'bluem_mandate_request_id' ) {
-					$newValue = $payload->report->MandateRequestID;
-				} elseif ( $value['field_name'] === 'bluem_mandate_datetime' ) {
-					$newValue = $mandateDateTimeFormatted;
-				} elseif ( $value['field_name'] === 'bluem_mandate_iban' ) {
-					$newValue = $payload->report->DebtorIBAN;
-				}
-
-				/**
-				 * Edit field.
-				 */
-				if ( ! empty( $newValue ) ) {
-					$result = GFAPI::update_entry_field( $entryID, $value['field_id'], $newValue );
-				}
-			}
-		}
-
-		// "De ondertekening is geslaagd";
-		if ( ! empty( $bluem_config->gformResultpage ) ) {
-			wp_redirect( home_url( $bluem_config->gformResultpage ) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=true" );
-			exit;
-		}
-		$errormessage = 'Fout: de ondertekening is geslaagd maar er is geen response URI opgegeven. Neem contact op met de website om dit technisch probleem aan te geven.';
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'gform_callback',
-				'message'  => $errormessage,
-			)
-		);
-		bluem_dialogs_render_prompt( $errormessage );
-		return;
-	} elseif ( $statusCode === 'Cancelled' ) {
-		// "Je hebt de mandaat ondertekening geannuleerd";
-		if ( ! empty( $bluem_config->gformResultpage ) ) {
-			wp_redirect( home_url( $bluem_config->gformResultpage ) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=cancelled" );
-			exit;
-		}
-		$errormessage = 'Fout: de transactie is geannuleerd. Probeer het opnieuw.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	} elseif ( $statusCode === 'Open' || $statusCode == 'Pending' ) {
-		// "De mandaat ondertekening is nog niet bevestigd. Dit kan even duren maar gebeurt automatisch."
-		if ( ! empty( $bluem_config->gformResultpage ) ) {
-			wp_redirect( home_url( $bluem_config->gformResultpage ) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=open" );
-			exit;
-		}
-		$errormessage = 'Fout: de transactie staat nog open. Dit kan even duren. Vernieuw deze pagina regelmatig voor de status.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	} elseif ( $statusCode === 'Expired' ) {
-		// "Fout: De mandaat of het verzoek daartoe is verlopen";
-		if ( ! empty( $bluem_config->gformResultpage ) ) {
-			wp_redirect( home_url( $bluem_config->gformResultpage ) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=expired" );
-			exit;
-		}
-		$errormessage = 'Fout: de transactie is verlopen. Probeer het opnieuw.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	} else {
-		bluem_error_report_email(
-			array(
-				'service'  => 'mandates',
-				'function' => 'gform_callback',
-				'message'  => "Fout: Onbekende of foutieve status teruggekregen: {$statusCode}<br>Neem contact op met de webshop en vermeld deze status; gebruiker wel doorverwezen terug naar site",
-			)
-		);
-		if ( ! empty( $bluem_config->gformResultpage ) ) {
-			wp_redirect( home_url( $bluem_config->gformResultpage ) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=error" );
-			exit;
-		}
-		$errormessage = 'Fout: er is een onbekende fout opgetreden. Probeer het opnieuw.';
-		bluem_dialogs_render_prompt( $errormessage );
-		exit;
-	}
-	exit;
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'gform_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+    $statusUpdateObject = $response->EMandateStatusUpdate;
+    $statusCode = $statusUpdateObject->EMandateStatus->Status . '';
+
+    $request_from_db = bluem_db_get_request_by_transaction_id_and_type(
+        $mandateID,
+        'mandates'
+    );
+
+    if ($statusCode !== $request_from_db->status) {
+        bluem_db_update_request(
+            $request_from_db->id,
+            array(
+                'status' => $statusCode,
+            )
+        );
+        // also update locally for email notification
+        $request_from_db->status = $statusCode;
+    }
+
+    bluem_transaction_notification_email(
+        $request_from_db->id
+    );
+
+    // Handling the response.
+    if ($statusCode === 'Success') {
+        if (!empty($request_from_db->payload)) {
+            try {
+                $newPayload = json_decode($request_from_db->payload);
+            } catch (Throwable $th) {
+                $newPayload = new Stdclass();
+            }
+        } else {
+            $newPayload = new Stdclass();
+        }
+
+        if (isset($response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport)) {
+            $newPayload->purchaseID = $response->EMandateStatusUpdate->EMandateStatus->PurchaseID . '';
+            $newPayload->report = $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport;
+
+            bluem_db_update_request(
+                $request_from_db->id,
+                array(
+                    'payload' => wp_json_encode($newPayload),
+                )
+            );
+        }
+
+        $request_from_db = bluem_db_get_request_by_transaction_id_and_type(
+            $mandateID,
+            'mandates'
+        );
+
+        if (!empty($entryID) && !empty($formID)) {
+            /**
+             * Get the entry instance.
+             */
+            $entry = GFAPI::get_entry($entryID);
+
+            // Get the form instance
+            $form = GFAPI::get_form($formID);
+
+            /**
+             * Update Gravity Forms details.
+             */
+            $entry['bluem_payload'] = array(
+                'mandate_id' => !empty($mandateID) ? $mandateID : '',
+                'mandate_entrance_code' => !empty($entranceCode) ? $entranceCode : '',
+                'bluem_record_id' => !empty($request_from_db) ? $request_from_db->id : '',
+                'status' => !empty($statusCode) ? $statusCode : '',
+            );
+
+            // Update the entry
+            $result = GFAPI::update_entry($entry);
+
+            /**
+             * Define form data.
+             */
+            $edit_data = array();
+            $form_data = array();
+
+            // Get the fields
+            $fields = $form['fields'];
+
+            // Loop through fields
+            foreach ($fields as $field) {
+                $field_id = $field['id'];
+                $field_name = $field['inputName'];
+                $field_label = $field['label'];
+                $field_value = rgar($entry, $field_id);
+
+                if (!empty($field_name)) {
+                    $edit_data[] = array(
+                        'field_id' => $field_id,
+                        'field_name' => $field_name,
+                        'field_label' => $field_label,
+                        'field_value' => $field_value,
+                    );
+                }
+
+                if (!empty($field_label)) {
+                    $form_data[$field_label] = $field_value;
+                } elseif (!empty($field_id)) {
+                    $form_data[$field_id] = $field_value;
+                }
+            }
+
+            // Loop through data
+            foreach ($edit_data as $key => $value) {
+                $newValue = '';
+
+                $payload = json_decode(wp_json_encode($newPayload));
+
+                $mandateDateTimeFormatted = '';
+                try {
+                    $mandateDateTime = new DateTimeImmutable($payload->report->DateTime);
+                    $mandateDateTimeFormatted = $mandateDateTime->format('d-m-Y H:i');
+                } catch (Exception $e) {
+                }
+
+                if ($value['field_name'] === 'bluem_mandate_accountname') {
+                    $newValue = $payload->report->DebtorAccountName;
+                } elseif ($value['field_name'] === 'bluem_mandate_request_id') {
+                    $newValue = $payload->report->MandateRequestID;
+                } elseif ($value['field_name'] === 'bluem_mandate_datetime') {
+                    $newValue = $mandateDateTimeFormatted;
+                } elseif ($value['field_name'] === 'bluem_mandate_iban') {
+                    $newValue = $payload->report->DebtorIBAN;
+                }
+
+                /**
+                 * Edit field.
+                 */
+                if (!empty($newValue)) {
+                    $result = GFAPI::update_entry_field($entryID, $value['field_id'], $newValue);
+                }
+            }
+        }
+
+        // "De ondertekening is geslaagd";
+        if (!empty($bluem_config->gformResultpage)) {
+            wp_redirect(home_url($bluem_config->gformResultpage) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=true");
+            exit;
+        }
+        $errormessage = 'Fout: de ondertekening is geslaagd maar er is geen response URI opgegeven. Neem contact op met de website om dit technisch probleem aan te geven.';
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'gform_callback',
+                'message' => $errormessage,
+            )
+        );
+        bluem_dialogs_render_prompt($errormessage);
+        return;
+    } elseif ($statusCode === 'Cancelled') {
+        // "Je hebt de mandaat ondertekening geannuleerd";
+        if (!empty($bluem_config->gformResultpage)) {
+            wp_redirect(home_url($bluem_config->gformResultpage) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=cancelled");
+            exit;
+        }
+        $errormessage = 'Fout: de transactie is geannuleerd. Probeer het opnieuw.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    } elseif ($statusCode === 'Open' || $statusCode == 'Pending') {
+        // "De mandaat ondertekening is nog niet bevestigd. Dit kan even duren maar gebeurt automatisch."
+        if (!empty($bluem_config->gformResultpage)) {
+            wp_redirect(home_url($bluem_config->gformResultpage) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=open");
+            exit;
+        }
+        $errormessage = 'Fout: de transactie staat nog open. Dit kan even duren. Vernieuw deze pagina regelmatig voor de status.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    } elseif ($statusCode === 'Expired') {
+        // "Fout: De mandaat of het verzoek daartoe is verlopen";
+        if (!empty($bluem_config->gformResultpage)) {
+            wp_redirect(home_url($bluem_config->gformResultpage) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=expired");
+            exit;
+        }
+        $errormessage = 'Fout: de transactie is verlopen. Probeer het opnieuw.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    } else {
+        bluem_error_report_email(
+            array(
+                'service' => 'mandates',
+                'function' => 'gform_callback',
+                'message' => "Fout: Onbekende of foutieve status teruggekregen: {$statusCode}<br>Neem contact op met de webshop en vermeld deze status; gebruiker wel doorverwezen terug naar site",
+            )
+        );
+        if (!empty($bluem_config->gformResultpage)) {
+            wp_redirect(home_url($bluem_config->gformResultpage) . "?form=$formID&entry=$entryID&mid=$mandateID&ec=$entranceCode&result=false&reason=error");
+            exit;
+        }
+        $errormessage = 'Fout: er is een onbekende fout opgetreden. Probeer het opnieuw.';
+        bluem_dialogs_render_prompt($errormessage);
+        exit;
+    }
+    exit;
 }
 
 /**
  * Gravity Forms integration.
  * Shortcode to display results.
  */
-add_shortcode( 'bluem_gform_results', 'bluem_woocommerce_integration_gform_results_shortcode' );
-
-function bluem_woocommerce_integration_gform_results_shortcode() {
-	$bluem_config = bluem_woocommerce_get_config();
-
-	if ( $bluem_config->gformActive !== 'Y' ) {
-		return;
-	}
-
-	if ( empty( $_GET['form'] ) || empty( $_GET['entry'] ) || empty( $_GET['mid'] ) || empty( $_GET['ec'] ) || empty( $_GET['result'] ) ) {
-		return 'Er is een fout opgetreden. Ga terug en probeer het opnieuw.';
-	}
-
-	$request_from_db = bluem_db_get_request_by_transaction_id_and_entrance_code(
-		sanitize_text_field( $_GET['mid'] ),
-		sanitize_text_field( $_GET['ec'] ),
-	);
-
-	if ( $request_from_db !== false ) {
-		$request_id = $request_from_db->id;
-
-		$entrance_code = $request_from_db->entrance_code;
-
-		$transaction_id = $request_from_db->transaction_id;
-
-		if ( ! empty( $request_from_db->payload ) ) {
-			$payload = json_decode( $request_from_db->payload );
-
-			if ( ! empty( $payload ) && ! empty( $payload->details ) ) {
-				$details = json_decode( $payload->details );
-
-				if ( ! empty( $details->payload ) ) {
-					$details_payload = json_decode( $details->payload );
-
-					$entry_id = $details_payload->entry_id;
-
-					$form_id = $details_payload->form_id;
-				}
-			}
-		}
-
-		if ( ! empty( $request_from_db->status ) ) {
-			$status = $request_from_db->status;
-		}
-	}
-
-	if ( ! empty( $entry_id ) ) {
-		/**
-		 * Get the entry instance.
-		 */
-		$entry = GFAPI::get_entry( $entry_id );
-
-		// Get the form instance
-		$form = GFAPI::get_form( $entry['form_id'] );
-
-		/**
-		 * Define form data.
-		 */
-		$form_data = array();
-
-		// Get the fields
-		$fields = $form['fields'];
-
-		// Loop through fields
-		foreach ( $fields as $field ) {
-			$field_id    = $field['id'];
-			$field_name  = $field['inputName'];
-			$field_label = $field['label'];
-			$field_value = rgar( $entry, $field_id );
-
-			if ( ! empty( $field_label ) ) {
-				$form_data[ $field_label ] = $field_value;
-			} elseif ( ! empty( $field_id ) ) {
-				$form_data[ $field_id ] = $field_value;
-			}
-		}
-	}
-
-	if ( ! empty( $status ) ) {
-		if ( $status === 'Success' ) {
-			return '<p>' . ! empty( $form_data ) && ! empty( $form_data['bluem_mandate_success'] ) ? $form_data['bluem_mandate_success'] : 'De machtiging is gelukt.' . '</p>';
-		} else {
-			return '<p>' . ! empty( $form_data ) && ! empty( $form_data['bluem_mandate_failure'] ) ? $form_data['bluem_mandate_failure'] : 'De machtiging is mislukt. Probeer het opnieuw.' . '</p>';
-		}
-	} else {
-		return '<p>' . ! empty( $form_data ) && ! empty( $form_data['bluem_mandate_failure'] ) ? $form_data['bluem_mandate_failure'] : 'De machtiging is mislukt. Probeer het opnieuw.' . '</p>';
-	}
+add_shortcode('bluem_gform_results', 'bluem_woocommerce_integration_gform_results_shortcode');
+
+function bluem_woocommerce_integration_gform_results_shortcode()
+{
+    $bluem_config = bluem_woocommerce_get_config();
+
+    if ($bluem_config->gformActive !== 'Y') {
+        return;
+    }
+
+    if (empty($_GET['form']) || empty($_GET['entry']) || empty($_GET['mid']) || empty($_GET['ec']) || empty($_GET['result'])) {
+        return 'Er is een fout opgetreden. Ga terug en probeer het opnieuw.';
+    }
+
+    $request_from_db = bluem_db_get_request_by_transaction_id_and_entrance_code(
+        sanitize_text_field($_GET['mid']),
+        sanitize_text_field($_GET['ec']),
+    );
+
+    if ($request_from_db !== false) {
+        $request_id = $request_from_db->id;
+
+        $entrance_code = $request_from_db->entrance_code;
+
+        $transaction_id = $request_from_db->transaction_id;
+
+        if (!empty($request_from_db->payload)) {
+            $payload = json_decode($request_from_db->payload);
+
+            if (!empty($payload) && !empty($payload->details)) {
+                $details = json_decode($payload->details);
+
+                if (!empty($details->payload)) {
+                    $details_payload = json_decode($details->payload);
+
+                    $entry_id = $details_payload->entry_id;
+
+                    $form_id = $details_payload->form_id;
+                }
+            }
+        }
+
+        if (!empty($request_from_db->status)) {
+            $status = $request_from_db->status;
+        }
+    }
+
+    if (!empty($entry_id)) {
+        /**
+         * Get the entry instance.
+         */
+        $entry = GFAPI::get_entry($entry_id);
+
+        // Get the form instance
+        $form = GFAPI::get_form($entry['form_id']);
+
+        /**
+         * Define form data.
+         */
+        $form_data = array();
+
+        // Get the fields
+        $fields = $form['fields'];
+
+        // Loop through fields
+        foreach ($fields as $field) {
+            $field_id = $field['id'];
+            $field_name = $field['inputName'];
+            $field_label = $field['label'];
+            $field_value = rgar($entry, $field_id);
+
+            if (!empty($field_label)) {
+                $form_data[$field_label] = $field_value;
+            } elseif (!empty($field_id)) {
+                $form_data[$field_id] = $field_value;
+            }
+        }
+    }
+
+    if (!empty($status)) {
+        if ($status === 'Success') {
+            return '<p>' . !empty($form_data) && !empty($form_data['bluem_mandate_success']) ? $form_data['bluem_mandate_success'] : 'De machtiging is gelukt.' . '</p>';
+        } else {
+            return '<p>' . !empty($form_data) && !empty($form_data['bluem_mandate_failure']) ? $form_data['bluem_mandate_failure'] : 'De machtiging is mislukt. Probeer het opnieuw.' . '</p>';
+        }
+    } else {
+        return '<p>' . !empty($form_data) && !empty($form_data['bluem_mandate_failure']) ? $form_data['bluem_mandate_failure'] : 'De machtiging is mislukt. Probeer het opnieuw.' . '</p>';
+    }
 }
diff --git a/bluem-payments.php b/bluem-payments.php
index 66736db..07e6f9d 100644
--- a/bluem-payments.php
+++ b/bluem-payments.php
@@ -41,10 +41,10 @@ function bluem_woocommerce_payments_settings_section()
 {
     echo '<p><a id="tab_payments"></a>
 <strong>Let op: naast het instellen van de onderstaande functies moet je ook de betaalmethoden activeren bij de
-<a href="' . (home_url() . 'wp-admin/admin.php?page=wc-settings&tab=checkout') . '" target="_blank">WooCommerce instellingen voor Betalingen</a>.
+<a href="' . (esc_url(home_url()) . 'wp-admin/admin.php?page=wc-settings&tab=checkout') . '" target="_blank">WooCommerce instellingen voor Betalingen</a>.
 </strong><br>
     Je kan hier belangrijke gegevens instellen rondom ePayments-transacties om gemakkelijk betalingen te ontvangen.</p>
-    <p>Lees <a href="' . BLUEM_WOOCOMMERCE_MANUAL_URL . '" target="_blank">de handleiding</a> voor meer informatie.</p>';
+    <p>Lees <a href="' . esc_url(BLUEM_WOOCOMMERCE_MANUAL_URL) . '" target="_blank">de handleiding</a> voor meer informatie.</p>';
 }
 
 function bluem_woocommerce_get_payments_option($key)
diff --git a/gateways/Bluem_Bank_Based_Payment_Gateway.php b/gateways/Bluem_Bank_Based_Payment_Gateway.php
index 36b8f43..c78ac61 100644
--- a/gateways/Bluem_Bank_Based_Payment_Gateway.php
+++ b/gateways/Bluem_Bank_Based_Payment_Gateway.php
@@ -307,7 +307,7 @@ public function bluem_bank_payments_webhook(): void
             }
         } catch (Exception $e) {
             http_response_code(500);
-            echo esc_html__("Error: Exception: ", 'bluem') . $e->getMessage();
+            echo esc_html__("Error: Exception", 'bluem') . esc_html($e->getMessage());
             exit;
         }
     }
diff --git a/gateways/Bluem_Mandates_Payment_Gateway.php b/gateways/Bluem_Mandates_Payment_Gateway.php
index f699e41..5570c2e 100644
--- a/gateways/Bluem_Mandates_Payment_Gateway.php
+++ b/gateways/Bluem_Mandates_Payment_Gateway.php
@@ -415,7 +415,9 @@ public function process_payment($order_id)
         }
 
         if ($response instanceof ErrorBluemResponse) {
-            throw new RuntimeException("An error occurred in the payment method. Please contact the webshop owner with this message:  " . $response->error());
+            throw new RuntimeException(
+                esc_html("An error occurred in the payment method. Please contact the webshop owner with this message:  " . $response->error())
+            );
         }
 
         $attrs = $response->EMandateTransactionResponse->attributes();
@@ -425,8 +427,8 @@ public function process_payment($order_id)
         }
         $entranceCode = $attrs['entranceCode'] . "";
 
-        update_post_meta($order_id, 'bluem_entrancecode', $entranceCode);
-        update_post_meta($order_id, 'bluem_mandateid', $mandate_id);
+        update_post_meta($order_id, 'bluem_entrancecode', esc_attr($entranceCode));
+        update_post_meta($order_id, 'bluem_mandateid', esc_attr($mandate_id));
 
         // https://docs.woocommerce.com/document/managing-orders/
         // Possible statuses: 'pending', 'processing', 'on-hold', 'completed', 'refunded, 'failed', 'cancelled',
@@ -578,7 +580,7 @@ public function bluem_mandates_webhook(): void
                             'processing',
                             printf(
                                 esc_html__('Authorization (Mandate ID %s) was successful and approved; via webhook', 'bluem'),
-                                $mandateID
+                                esc_attr($mandateID)
                             )
                         );
                     }
@@ -600,7 +602,7 @@ public function bluem_mandates_webhook(): void
             printf(
             /* translators: %s: exception message */
                 esc_html__("Error: Exception: %s", 'bluem'),
-                $e->getMessage()
+                esc_html($e->getMessage())
             );
             exit;
         }
@@ -915,11 +917,10 @@ private function validateMandate($response, $order, $block_processing = false, $
                                 /* translators: %1$s: order total plus 10%, %2$s: URL to payment page */
                                     '<p>Het automatische incasso mandaat dat je hebt afgegeven is niet toereikend voor de incassering van het factuurbedrag van jouw bestelling.</p>
 <p>De geschatte factuurwaarde van jouw bestelling is EUR %1$s. Het mandaat voor de automatische incasso die je hebt ingesteld is EUR {$maxAmountResponse->amount}. Ons advies is om jouw mandaat voor automatische incasso te verhogen of voor "onbeperkt" te kiezen.</p>'
-                                    .
-                                    '<p><a href="%2$s" target="_self">Klik hier om terug te gaan naar de betalingspagina en een nieuw mandaat af te geven</a></p>',
+                                    . '<p><a href="%2$s" target="_self">Klik hier om terug te gaan naar de betalingspagina en een nieuw mandaat af te geven</a></p>',
                                     'bluem'),
                                 $order_total_plus_string,
-                                $url
+                                esc_url($url)
                             )
                         ),
                         false
@@ -998,7 +999,7 @@ private function validateMandate($response, $order, $block_processing = false, $
                 printf(
                 /* translators: %1$s: mandate id, %2$s: request id */
                     esc_html__('Authorization (Mandate ID %1$s, Request ID %2$s) has been obtained and approved', 'bluem'),
-                    $mandate_id, $request_id
+                    esc_attr($mandate_id), esc_attr($request_id)
                 )
             );
 
diff --git a/src/Observability/BluemActivationNotifier.php b/src/Observability/BluemActivationNotifier.php
index 5d004f5..36d2470 100644
--- a/src/Observability/BluemActivationNotifier.php
+++ b/src/Observability/BluemActivationNotifier.php
@@ -2,110 +2,101 @@
 
 namespace Bluem\Wordpress\Observability;
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+if (!defined('ABSPATH')) {
+    exit;
 }
 
 use Exception;
 use stdClass;
 
-class BluemActivationNotifier {
-
-
-	private const NOTIFICATION_EMAIL = 'pluginsupport@bluem.nl';
-
-
-	/**
-	 * Registration reporting email functionality
-	 */
-	public function reportActivatedPlugin(): bool {
-		$data = $this->createReportData();
-
-		$author_name  = 'Administratie van ' . esc_attr( get_bloginfo( 'name' ) );
-		$author_email = esc_attr(
-			get_option( 'admin_email' )
-		);
-
-		$to = self::NOTIFICATION_EMAIL;
-
-		$subject = '[' . get_bloginfo( 'name' ) . '] WordPress plug-in activation';
-
-		$message  = sprintf( '<p>WordPress plug-in activation (door %s <%s>),</p>', $author_name, $author_email );
-		$message .= sprintf( '<p>Data:<br>%s</p>', $this->createStringFromData( $data ) );
-		$message .= sprintf( '<p>Raw Data:<br>%s</p>', wp_json_encode( $data ) );
-
-		$message = nl2br( $message );
-
-		$headers = array( 'Content-Type: text/html; charset=UTF-8' );
-		$mailing = wp_mail( $to, $subject, $message, $headers );
-
-		// if ($mailing) {
-		// bluem_db_request_log(0, "Sent activation report mail to " . $to);
-		// }
-		//
-		// if ($this->writeActivationFile($data)) {
-		// bluem_db_request_log(0, "Written activation log file");
-		// }
-
-		return $mailing;
-	}
-
-	private function createReportData(): object {
-		$bluem_options      = get_option( 'bluem_woocommerce_options' );
-		$bluem_registration = get_option( 'bluem_woocommerce_registration' );
-
-		$dependency_bluem_php_version = bluem_get_composer_dependency_version( 'bluem-development/bluem-php' ) ?? 'unknown';
-
-		$activation_report_id = sprintf( '%s_%s', gmdate( 'Ymdhis' ), random_int( 0, 512 ) );
-
-		$data                          = new Stdclass();
-		$data->activation_report_id    = $activation_report_id;
-		$data->{'Bluem SenderID'}      = $bluem_options['senderID'] ?? '';
-		$data->{'Website name'}        = esc_attr( get_bloginfo( 'name' ) );
-		$data->{'Website URL'}         = esc_attr( get_bloginfo( 'url' ) );
-		$data->{'Admin email'}         = esc_attr( get_bloginfo( 'admin_email' ) );
-		$data->{'Company name'}        = isset( $bluem_registration['company']['name'] ) ? $bluem_registration['company']['name'] : 'Company name onbekend';
-		$data->{'Company telephone'}   = isset( $bluem_registration['company']['telephone'] ) ? $bluem_registration['company']['telephone'] : 'Company telephone onbekend';
-		$data->{'Company email'}       = isset( $bluem_registration['company']['email'] ) ? $bluem_registration['company']['email'] : 'Company email onbekend';
-		$data->{'Tech name'}           = isset( $bluem_registration['tech_contact']['name'] ) ? $bluem_registration['tech_contact']['name'] : 'Tech name onbekend';
-		$data->{'Tech telephone'}      = isset( $bluem_registration['tech_contact']['telephone'] ) ? $bluem_registration['tech_contact']['telephone'] : 'Tech telephone onbekend';
-		$data->{'Tech email'}          = isset( $bluem_registration['tech_contact']['email'] ) ? $bluem_registration['tech_contact']['email'] : 'Tech email onbekend';
-		$data->{'WooCommerce version'} = class_exists( 'WooCommerce' ) ? WC()->version : esc_html__( 'WooCommerce not installed', 'bluem' );
-		$data->{'WordPress version'}   = get_bloginfo( 'version' );
-		$data->{'Bluem PHP-library'}   = $dependency_bluem_php_version;
-		$data->{'Plug-in version'}     = esc_attr( $bluem_options['bluem_plugin_version'] ?? '0' );
-		$data->{'PHP version'}         = PHP_VERSION;
-		$data->{'Activation date'}     = gmdate( 'Y-m-d H:i:s' );
-		$data->{'Activation IP'}       = ''; // @todo: get IP?
-
-		return $data;
-	}
-
-	private function writeActivationFile( stdClass $data ): bool {
-		$path     = __DIR__ . '/../../'; // back to root folder of plugin
-		$filename = sprintf( 'logs/activations_%s.json', gmdate( 'Ymd' ) );
-
-		try {
-			$fileContent = wp_json_encode( $data, JSON_THROW_ON_ERROR ) . "\r\n";
-		} catch ( Exception ) {
-			return false;
-		}
-
-		return file_put_contents( $path . $filename, $fileContent, FILE_APPEND ) !== false;
-	}
-
-	private function createStringFromData( stdClass $data ): string {
-		ob_start();
-		foreach ( $data as $k => $v ) {
-			if ( is_null( $v ) ) {
-				continue;
-			}
-
-			bluem_render_obj_row_recursive(
-				sprintf( '<strong>%s</strong>', ucfirst( $k ) ),
-				$v
-			);
-		}
-		return ob_get_clean() ?? '';
-	}
+class BluemActivationNotifier
+{
+
+
+    private const NOTIFICATION_EMAIL = 'pluginsupport@bluem.nl';
+
+
+    /**
+     * Registration reporting email functionality
+     */
+    public function reportActivatedPlugin(): bool
+    {
+        $data = $this->createReportData();
+
+        $author_name = 'Administratie van ' . esc_attr(get_bloginfo('name'));
+        $author_email = esc_attr(
+            get_option('admin_email')
+        );
+
+        $to = self::NOTIFICATION_EMAIL;
+
+        $subject = '[' . get_bloginfo('name') . '] WordPress plug-in activation';
+
+        $message = sprintf('<p>WordPress plug-in activation (door %s <%s>),</p>', $author_name, $author_email);
+        $message .= sprintf('<p>Data:<br>%s</p>', $this->createStringFromData($data));
+        $message .= sprintf('<p>Raw Data:<br>%s</p>', wp_json_encode($data));
+
+        $message = nl2br($message);
+
+        $headers = array('Content-Type: text/html; charset=UTF-8');
+        $mailing = wp_mail($to, $subject, $message, $headers);
+
+        // if ($mailing) {
+        // bluem_db_request_log(0, "Sent activation report mail to " . $to);
+        // }
+        //
+        // if ($this->writeActivationFile($data)) {
+        // bluem_db_request_log(0, "Written activation log file");
+        // }
+
+        return $mailing;
+    }
+
+    private function createReportData(): object
+    {
+        $bluem_options = get_option('bluem_woocommerce_options');
+        $bluem_registration = get_option('bluem_woocommerce_registration');
+
+        $dependency_bluem_php_version = bluem_get_composer_dependency_version('bluem-development/bluem-php') ?? 'unknown';
+
+        $activation_report_id = sprintf('%s_%s', gmdate('Ymdhis'), random_int(0, 512));
+
+        $data = new Stdclass();
+        $data->activation_report_id = $activation_report_id;
+        $data->{'Bluem SenderID'} = $bluem_options['senderID'] ?? '';
+        $data->{'Website name'} = esc_attr(get_bloginfo('name'));
+        $data->{'Website URL'} = esc_attr(get_bloginfo('url'));
+        $data->{'Admin email'} = esc_attr(get_bloginfo('admin_email'));
+        $data->{'Company name'} = isset($bluem_registration['company']['name']) ? $bluem_registration['company']['name'] : 'Company name onbekend';
+        $data->{'Company telephone'} = isset($bluem_registration['company']['telephone']) ? $bluem_registration['company']['telephone'] : 'Company telephone onbekend';
+        $data->{'Company email'} = isset($bluem_registration['company']['email']) ? $bluem_registration['company']['email'] : 'Company email onbekend';
+        $data->{'Tech name'} = isset($bluem_registration['tech_contact']['name']) ? $bluem_registration['tech_contact']['name'] : 'Tech name onbekend';
+        $data->{'Tech telephone'} = isset($bluem_registration['tech_contact']['telephone']) ? $bluem_registration['tech_contact']['telephone'] : 'Tech telephone onbekend';
+        $data->{'Tech email'} = isset($bluem_registration['tech_contact']['email']) ? $bluem_registration['tech_contact']['email'] : 'Tech email onbekend';
+        $data->{'WooCommerce version'} = class_exists('WooCommerce') ? WC()->version : esc_html__('WooCommerce not installed', 'bluem');
+        $data->{'WordPress version'} = get_bloginfo('version');
+        $data->{'Bluem PHP-library'} = $dependency_bluem_php_version;
+        $data->{'Plug-in version'} = esc_attr($bluem_options['bluem_plugin_version'] ?? '0');
+        $data->{'PHP version'} = PHP_VERSION;
+        $data->{'Activation date'} = gmdate('Y-m-d H:i:s');
+        $data->{'Activation IP'} = ''; // @todo: get IP?
+
+        return $data;
+    }
+
+    private function createStringFromData(stdClass $data): string
+    {
+        ob_start();
+        foreach ($data as $k => $v) {
+            if (is_null($v)) {
+                continue;
+            }
+
+            bluem_render_obj_row_recursive(
+                sprintf('<strong>%s</strong>', ucfirst($k)),
+                $v
+            );
+        }
+        return ob_get_clean() ?? '';
+    }
 }
diff --git a/views/home.php b/views/home.php
index 4ffa412..34ff3bc 100644
--- a/views/home.php
+++ b/views/home.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 
 <?php $pluginDetailsLink = 'plugin-install.php?tab=plugin-information&plugin=bluem&TB_iframe=true&width=600&height=550'; ?>
@@ -19,7 +19,7 @@
     }
 
     .bluem_logo:before {
-        background-image: url('<?php echo plugin_dir_url( '' ); ?>/bluem/assets/bluem/logo-hero.png');
+        background-image: url('<?php echo esc_url(plugin_dir_url( '' )); ?>/bluem/assets/bluem/logo-hero.png');
         background-size: contain;
         background-repeat: no-repeat;
         content: '';
@@ -29,7 +29,7 @@
 
 <div class="wrap">
     <h1>
-        <?php echo bluem_get_bluem_logo_html(48); ?>
+        <?php echo wp_kses_post(bluem_get_bluem_logo_html(48)); ?>
     </h1>
 
     <?php bluem_render_nav_header('home'); ?>
@@ -46,16 +46,18 @@
 
     <p>
         <strong><?php esc_html_e('Plugin versie', 'bluem'); ?></strong><br/><?php esc_html_e('Versie', 'bluem'); ?> <?php $bluem = get_plugin_data(plugin_dir_path(__FILE__) . '../bluem.php');
-        echo esc_html($bluem['Version']); ?> (<a href="<?php echo admin_url($pluginDetailsLink); ?>"
-                                       target="_blank"><?php esc_html_e('Details bekijken', 'bluem'); ?></a>)</p>
+        echo esc_html($bluem['Version']); ?> (<a href="<?php echo esc_url(admin_url($pluginDetailsLink)); ?>"
+                                                 target="_blank"><?php esc_html_e('Details bekijken', 'bluem'); ?></a>)
+    </p>
 
     <p>
-        <strong><?php esc_html_e('Technische informatie', 'bluem'); ?></strong><br/><?php esc_html_e('WordPress versie:', 'bluem'); ?> <?php echo get_bloginfo('version'); ?>
+        <strong><?php esc_html_e('Technische informatie', 'bluem'); ?></strong><br/><?php esc_html_e('WordPress versie:', 'bluem'); ?> <?php echo esc_html(get_bloginfo('version')); ?>
+        <br/>
+        <?php esc_html_e('WooCommerce versie:', 'bluem'); ?> <?php echo class_exists('WooCommerce') ? esc_attr(WC()->version) : esc_html__('WooCommerce not installed', 'bluem'); ?>
         <br/>
-        <?php esc_html_e('WooCommerce versie:', 'bluem'); ?> <?php echo class_exists('WooCommerce') ? WC()->version : esc_html__('WooCommerce not installed', 'bluem'); ?>
+        <?php esc_html_e('Bluem PHP-library versie:', 'bluem'); ?> <?php echo esc_html($dependency_bluem_php_version ?? '-'); ?>
         <br/>
-        <?php esc_html_e('Bluem PHP-library versie:', 'bluem'); ?> <?php echo esc_html($dependency_bluem_php_version ?? '-'); ?><br/>
-        <?php esc_html_e('PHP versie:', 'bluem'); ?> <?php echo PHP_VERSION; ?></p>
+        <?php esc_html_e('PHP versie:', 'bluem'); ?> <?php echo esc_attr(PHP_VERSION); ?></p>
 
     <?php bluem_render_footer(); ?>
 </div>
diff --git a/views/importexport.php b/views/importexport.php
index 0cfb51c..e0abe47 100644
--- a/views/importexport.php
+++ b/views/importexport.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 
 <style>
@@ -19,8 +19,8 @@
     <h1>
         <?php wp_kses_post(
             sprintf(
-                /* translators: %s: logo html */
-                esc_html__('%s Import / export','bluem'),
+            /* translators: %s: logo html */
+                esc_html__('%s Import / export', 'bluem'),
                 bluem_get_bluem_logo_html(48),
             )
         ); ?>
@@ -66,13 +66,15 @@
         <p>
             <?php esc_html_e('Upload je instellingen hier.', 'bluem'); ?>
 
-        <form method="post" action="<?php echo admin_url('admin.php?page=bluem_admin_importexport&action=import'); ?>">
+        <form method="post"
+              action="<?php echo esc_url(admin_url('admin.php?page=bluem_admin_importexport&action=import')); ?>">
             <input type="hidden" name="action" value="import">
             <label for="import">
-            Input:
+                Input:
             </label>
             <textarea class="bluem_port_input" name="import" id="import" rows="20"></textarea>
-            <p><strong><?php esc_html_e('Let op! Bestaande instellingen zullen worden overschreven.', 'bluem'); ?></strong>
+            <p>
+                <strong><?php esc_html_e('Let op! Bestaande instellingen zullen worden overschreven.', 'bluem'); ?></strong>
             </p>
             <button type="submit"><?php esc_html_e('Importeren', 'bluem'); ?></button>
         </form>
diff --git a/views/request.php b/views/request.php
index 39a55cf..ee1082c 100644
--- a/views/request.php
+++ b/views/request.php
@@ -2,7 +2,7 @@
 ?>
 <div class="wrap">
     <h1>
-        <?php echo bluem_get_bluem_logo_html(48); ?>
+        <?php echo wp_kses_post(bluem_get_bluem_logo_html(48)); ?>
         <?php esc_html_e('Transactiedetails', 'bluem'); ?>
     </h1>
 
@@ -13,7 +13,7 @@
         <div class="bluem-request-card-body">
             <div class='bluem-column' style="width: 50%;">
                 <h2>
-                    <?php echo ucfirst($request->type); ?>
+                    <?php echo esc_html(ucfirst($request->type)); ?>
                     <?php esc_html_e('Transactie', 'bluem'); ?>
                 </h2>
 
@@ -44,7 +44,8 @@
                             ?>
                             <tr>
                                 <td><?php esc_html_e('Bestelling', 'bluem'); ?>:</td>
-                                <td><a href="<?php echo admin_url("post.php?post={$request->order_id}&action=edit"); ?>"
+                                <td>
+                                    <a href="<?php echo esc_url(admin_url("post.php?post={$request->order_id}&action=edit")); ?>"
                                        title="Bestelling bekijken"
                                        target="_blank">#<?php echo esc_html($order->get_order_number()); ?>
                                         (<?php echo wp_kses_post(wc_price($order->get_total())); ?>)</a></td>
@@ -54,7 +55,8 @@
                     <tr>
                         <td><?php esc_html_e('Gebruiker', 'bluem'); ?>:</td>
                         <?php if (isset($request_author->user_nicename) && $request_author !== false) { ?>
-                            <td><a href="<?php echo admin_url("user-edit.php?user_id=" . $request->user_id); ?>"
+                            <td>
+                                <a href="<?php echo esc_url(admin_url("user-edit.php?user_id=" . $request->user_id)); ?>"
                                    target="_blank"><?php echo esc_html($request_author->user_nicename); ?></a></td>
                         <?php } else { ?>
                             <td><?php esc_html_e('Gastgebruiker/onbekend', 'bluem'); ?></td>
@@ -69,7 +71,7 @@
                     <tr>
                         <td><?php esc_html_e('Status', 'bluem'); ?>:</td>
                         <td><?php bluem_render_request_status($request->status); ?>
-                            (<a href="<?php echo admin_url("admin.php?page=bluem-transactions&request_id=" . $request->id . "&admin_action=status-update"); ?>"
+                            (<a href="<?php echo esc_url(admin_url("admin.php?page=bluem-transactions&request_id=" . $request->id . "&admin_action=status-update")); ?>"
                                 title="Update status">
                                 <?php esc_html_e('Update status', 'bluem'); ?></a>
                             )
@@ -99,10 +101,10 @@
                                 <?php $order_data = $order->get_data(); ?>
                                 <tr>
                                     <td>
-                                        <?php echo bluem_get_formattedDate($order->get_date_created(), 'd-m-Y H:i'); ?>
+                                        <?php echo esc_html(bluem_get_formattedDate($order->get_date_created(), 'd-m-Y H:i')); ?>
                                     </td>
                                     <td>
-                                        <a href='<?php echo admin_url("post.php?post={$link->item_id}&action=edit"); ?>'
+                                        <a href='<?php echo esc_url(admin_url("post.php?post={$link->item_id}&action=edit")); ?>'
                                            target='_blank'><?php esc_html_e('Order', 'bluem'); ?>
                                             #<?php echo esc_html($order->get_order_number()); ?></a>
                                     </td>
@@ -136,7 +138,7 @@
                         $dparts = explode(esc_html__('Nieuwe data:', 'bluem'), $d, 2); ?>
                         <li>
                         <span class="bluem-request-label">
-                            <?php echo bluem_get_formattedDate($log->timestamp); ?>
+                            <?php echo esc_html(bluem_get_formattedDate($log->timestamp)); ?>
                         </span>
                         <?php echo wp_kses_post($dparts[0]); ?><?php
                         if (isset($dparts[1])) {
@@ -160,7 +162,8 @@
                     <?php esc_html_e('Link naar transactie', 'bluem'); ?>:
                 </span>
                         <br>
-                        <a href="<?php echo $request->transaction_url; ?>" target="_blank" rel="noopener noreferrer">
+                        <a href="<?php echo esc_url($request->transaction_url); ?>" target="_blank"
+                           rel="noopener noreferrer">
                             <?php esc_html_e('Transactie bekijken', 'bluem'); ?>
                             <span class="dashicons dashicons-external" style="text-decoration: none;"></span>
                         </a>
@@ -207,7 +210,7 @@
                 <p style="margin: 5px 0; padding: 0;"><span
                             class="bluem-request-label"><?php esc_html_e('Administratie', 'bluem'); ?>:</span></p>
                 <p style="margin: 5px 0; padding: 0;"><a
-                            href="<?php echo admin_url("admin.php?page=bluem-transactions&request_id=" . esc_attr($request->id) . "&admin_action=delete"); ?>"
+                            href="<?php echo esc_url(admin_url("admin.php?page=bluem-transactions&request_id=" . esc_attr($request->id) . "&admin_action=delete")); ?>"
                             class="button bluem-button-danger"
                             onclick="return confirm('<?php esc_html_e('Weet je zeker dat je de transactie wilt verwijderen?', 'bluem'); ?>');"
                             style="margin-top:5pt;"><?php esc_html_e('Verwijder dit verzoek direct', 'bluem'); ?></a>
diff --git a/views/requests.php b/views/requests.php
index a956b74..a6dbcc6 100644
--- a/views/requests.php
+++ b/views/requests.php
@@ -1,8 +1,8 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wrap">
     <h1>
-        <?php echo bluem_get_bluem_logo_html(48); ?>
+        <?php echo wp_kses_post(bluem_get_bluem_logo_html(48)); ?>
         <?php esc_html_e('Transacties', 'bluem'); ?>
     </h1>
 
@@ -14,7 +14,7 @@
             if (isset($requests)) {
                 foreach ($requests as $cat => $rs) { ?>
                     <a href="#" class="nav-tab" data-tab="<?php echo esc_attr($cat); ?> ">
-                        <?php echo bluem_render_requests_type($cat);
+                        <?php echo wp_kses_post(bluem_render_requests_type($cat));
 
                         if (!empty($rs)) {
                             $count = count($rs);