diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 8051fd6..3b3ff08
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
 # PayWeb_WooCommerce
-## PayGate WooCommerce plugin v1.4.7 for WooCommerce v8.3.1
 
-This is the Paygate plugin for WooCommerce. Please feel free to contact the Payfast support team at support@payfast.io should you require any assistance.
+## PayGate WooCommerce plugin v1.4.8 for WooCommerce v8.9.1
+
+This is the Paygate plugin for WooCommerce. Please feel free to contact the Payfast support team at support@payfast.io
+should you require any assistance.
 
 ## Installation
+
 [![How To Setup PayGate PayWeb for WooCommerce](https://appinlet.com/wp-content/uploads/2021/01/How-To-Setup-PayGate-PayWeb-for-WooCommerce.jpg)](https://www.youtube.com/watch?v=MMcEG7FmoEM "How To Setup PayGate PayWeb for WooCommerce")
 
-Please navigate to the [releases page](https://github.com/PayGate/PayWeb_WooCommerce/releases), download the latest release (v1.4.7) and unzip. You will them be able to follow the integration guide PDF which is included in the zip.
+Please navigate to the [releases page](https://github.com/PayGate/PayWeb_WooCommerce/releases), download the latest
+release (v1.4.8) and unzip. You will them be able to follow the integration guide PDF which is included in the zip.
 
 ## Collaboration
 
diff --git a/changelog.txt b/changelog.txt
index 405e306..c3d1fe2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,8 @@
 *** Paygate for WooCommerce Changelog ***
+= 1.4.8 - 2024-05-28 =
+ * Tested on WooCommerce 8.9.1, PHP 8.1 and WordPress 6.5.3.
+ * Fix payment types compatibility.
+
 = 1.4.7 - 2023-11-22 =
  * Tested on WooCommerce 8.3.1, PHP 8.0 and WordPress 6.4.1.
  * Add support for HPOS and Blocks.
diff --git a/classes/WC_Gateway_PayGate.php b/classes/WC_Gateway_PayGate.php
index 0078614..2202bb6 100644
--- a/classes/WC_Gateway_PayGate.php
+++ b/classes/WC_Gateway_PayGate.php
@@ -1,13 +1,13 @@
 <?php
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
  * Released under the GNU General Public License
  */
 
-if ( ! defined('ABSPATH')) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -29,97 +29,99 @@
 class WC_Gateway_PayGate extends WC_Payment_Gateway
 {
 
-    const TEST_PAYGATE_ID                     = '10011072130';
-    const TEST_ENCRYPTION_KEY                 = 'secret';
-    const ID                                  = 'paygate';
-    const NEW_PAYMENT_METHOD_SESSION          = 'wc-paygate-new-payment-method';
-    const PAYGATE_PAYMENT_TOKEN               = 'wc-paygate-payment-token';
-    const ENCRYPTION_KEY                      = 'encryption_key';
-    const TITLE                               = 'title';
-    const PAYGATE_ID_LOWER_CASE               = 'paygate_id';
-    const DESCRIPTION                         = 'description';
-    const MESSAGE                             = 'message';
-    const WC_CLASS                            = 'class';
-    const TESTMODE                            = 'testmode';
-    const CHECKBOX                            = 'checkbox';
-    const DESC_TIP                            = 'desc_tip';
-    const DEFAULT_CONST                       = 'default';
-    const REDIRECT                            = 'redirect';
-    const DISABLENOTIFY                       = 'disablenotify';
-    const ALTERNATECARTHANDLING               = 'alternatecarthandling';
-    const TRANSACTION_STATUS                  = 'TRANSACTION_STATUS';
-    const RESULT_CODE                         = 'RESULT_CODE';
-    const RESULT_DESC                         = 'RESULT_DESC';
-    const PROCESSING                          = 'processing';
-    const COMPLETED                           = 'completed';
-    const FAILED                              = 'failed';
-    const PENDING                             = 'pending';
-    const PAYGATE_ID                          = 'PAYGATE_ID';
-    const PAY_REQUEST_ID                      = 'PAY_REQUEST_ID';
-    const REFERENCE                           = 'REFERENCE';
-    const CHECKSUM                            = 'CHECKSUM';
-    const METHOD                              = 'method';
-    const TIMEOUT                             = 'timeout';
-    const SSLVERIFY                           = 'sslverify';
-    const USER_AGENT                          = 'user-agent';
-    const HTTPVERSION                         = 'httpversion';
-    const ORDER_ID                            = 'order_id';
-    const VAULT                               = 'VAULT';
-    const PAYMENT_TOKEN                       = '-payment-token';
-    const VAULT_ID                            = 'VAULT_ID';
-    const PAYGATE_CHECKOUT_JS                 = 'paygate-checkout-js';
-    const PAYGATE_PAYMETHOD_JS                = 'paygate-paymethod-js';
-    const NEW_PAYMENT_METHOD                  = '-new-payment-method';
-    const PAYVAULT_DATA_1                     = 'PAYVAULT_DATA_1';
-    const PAYVAULT_DATA_2                     = 'PAYVAULT_DATA_2';
-    const PAYVAULT                            = 'PayVault';
-    const ENABLE                              = 'Enable ';
-    const LABEL                               = 'label';
-    const TYPE                                = 'type';
-    const PAY_METHOD_DETAIL                   = 'PAY_METHOD_DETAIL';
-    const TRANSACTION_ID                      = 'TRANSACTION_ID';
-    const PAY_REQUEST_ID_TEXT                 = ' Pay Request Id: ';
-    const BR                                  = '<br/>';
-    const SCRIPT_TAG                          = '";</script>';
-    const SCRIPT_WIN_TOP_LOCAT_HREF           = '<script>window.top.location.href="';
-    const ERROR                               = 'error';
-    const PAYGATE_TRANS_ID                    = '<br/>Paygate Trans Id: ';
+    const TEST_PAYGATE_ID            = '10011072130';
+    const TEST_ENCRYPTION_KEY        = 'secret';
+    const ID                         = 'paygate';
+    const NEW_PAYMENT_METHOD_SESSION = 'wc-paygate-new-payment-method';
+    const PAYGATE_PAYMENT_TOKEN      = 'wc-paygate-payment-token';
+    const ENCRYPTION_KEY             = 'encryption_key';
+    const TITLE                      = 'title';
+    const PAYGATE_ID_LOWER_CASE      = 'paygate_id';
+    const DESCRIPTION                = 'description';
+    const MESSAGE                    = 'message';
+    const WC_CLASS                   = 'class';
+    const TESTMODE                   = 'testmode';
+    const CHECKBOX                   = 'checkbox';
+    const DESC_TIP                   = 'desc_tip';
+    const DEFAULT_CONST              = 'default';
+    const REDIRECT                   = 'redirect';
+    const DISABLENOTIFY              = 'disablenotify';
+    const ALTERNATECARTHANDLING      = 'alternatecarthandling';
+    const TRANSACTION_STATUS         = 'TRANSACTION_STATUS';
+    const RESULT_CODE                = 'RESULT_CODE';
+    const RESULT_DESC                = 'RESULT_DESC';
+    const PROCESSING                 = 'processing';
+    const COMPLETED                  = 'completed';
+    const FAILED                     = 'failed';
+    const PENDING                    = 'pending';
+    const PAYGATE_ID                 = 'PAYGATE_ID';
+    const PAY_REQUEST_ID             = 'PAY_REQUEST_ID';
+    const REFERENCE                  = 'REFERENCE';
+    const CHECKSUM                   = 'CHECKSUM';
+    const METHOD                     = 'method';
+    const TIMEOUT                    = 'timeout';
+    const SSLVERIFY                  = 'sslverify';
+    const USER_AGENT                 = 'user-agent';
+    const HTTPVERSION                = 'httpversion';
+    const ORDER_ID                   = 'order_id';
+    const VAULT                      = 'VAULT';
+    const PAYMENT_TOKEN              = '-payment-token';
+    const VAULT_ID                   = 'VAULT_ID';
+    const PAYGATE_CHECKOUT_JS        = 'paygate-checkout-js';
+    const PAYGATE_PAYMETHOD_JS       = 'paygate-paymethod-js';
+    const NEW_PAYMENT_METHOD         = '-new-payment-method';
+    const PAYVAULT_DATA_1            = 'PAYVAULT_DATA_1';
+    const PAYVAULT_DATA_2            = 'PAYVAULT_DATA_2';
+    const PAYVAULT                   = 'PayVault';
+    const ENABLE                     = 'Enable ';
+    const LABEL                      = 'label';
+    const TYPE                       = 'type';
+    const PAY_METHOD_DETAIL          = 'PAY_METHOD_DETAIL';
+    const TRANSACTION_ID             = 'TRANSACTION_ID';
+    const PAY_REQUEST_ID_TEXT        = ' Pay Request Id: ';
+    const BR                         = '<br/>';
+    const SCRIPT_TAG                 = '";</script>';
+    const SCRIPT_WIN_TOP_LOCAT_HREF  = '<script>window.top.location.href="';
+    const ERROR                      = 'error';
+    const PAYGATE_TRANS_ID           = '<br/>Paygate Trans Id: ';
 
     // Payment methods
-    const CREDIT_CARD                         = 'pw3_credit_card';
-    const BANK_TRANSFER                       = 'pw3_bank_transfer';
-    const ZAPPER                              = 'pw3_e_zapper';
-    const SNAPSCAN                            = 'pw3_e_snapscan';
-    const PAYPAL                              = 'pw3_e_paypal';
-    const MOBICRED                            = 'pw3_e_mobicred';
-    const MOMOPAY                             = 'pw3_e_momopay';
-    const SCANTOPAY                          = 'pw3_e_scantopay';
-    const CREDIT_CARD_METHOD                  = 'CC';
-    const BANK_TRANSFER_METHOD                = 'BT';
-    const ZAPPER_METHOD                       = 'EW-ZAPPER';
-    const SNAPSCAN_METHOD                     = 'EW-SNAPSCAN';
-    const PAYPAL_METHOD                       = 'EW-PAYPAL';
-    const MOBICRED_METHOD                     = 'EW-MOBICRED';
-    const MOMOPAY_METHOD                      = 'EW-MOMOPAY';
-    const SCANTOPAY_METHOD                    = 'EW-MASTERPASS';
-    const SAMSUNG_PAY                         = 'EW-SAMSUNGPAY';
-    const APPLE_PAY                           = 'CC-APPLEPAY';
-    const RCS_METHOD                          = 'EW-RCS';
+    const CREDIT_CARD          = 'pw3_credit_card';
+    const BANK_TRANSFER        = 'pw3_bank_transfer';
+    const ZAPPER               = 'pw3_e_zapper';
+    const SNAPSCAN             = 'pw3_e_snapscan';
+    const PAYPAL               = 'pw3_e_paypal';
+    const MOBICRED             = 'pw3_e_mobicred';
+    const MOMOPAY              = 'pw3_e_momopay';
+    const SCANTOPAY            = 'pw3_e_scantopay';
+    const CREDIT_CARD_METHOD   = 'CC';
+    const BANK_TRANSFER_METHOD = 'BT';
+    const ZAPPER_METHOD        = 'EW-Zapper';
+    const SNAPSCAN_METHOD      = 'EW-Snapscan';
+    const PAYPAL_METHOD        = 'EW-Paypal';
+    const MOBICRED_METHOD      = 'EW-Mobicred';
+    const MOMOPAY_METHOD       = 'EW-Momopay';
+    const SCANTOPAY_METHOD     = 'EW-MasterPass';
+    const SAMSUNG_PAY          = 'EW-Samsungpay';
+    const APPLE_PAY            = 'CC-Applepay';
+    const RCS_METHOD           = 'CC-RCS';
 
     // Payment method descriptions
-    const CREDIT_CARD_DESCRIPTION             = 'Card';
-    const BANK_TRANSFER_DESCRIPTION           = 'SiD Secure EFT';
-    const BANK_TRANSFER_METHOD_DETAIL         = 'SID';
-    const ZAPPER_DESCRIPTION                  = 'Zapper';
-    const SNAPSCAN_DESCRIPTION                = 'SnapScan';
-    const PAYPAL_DESCRIPTION                  = 'PayPal';
-    const MOBICRED_DESCRIPTION                = 'Mobicred';
-    const MOMOPAY_DESCRIPTION                 = 'MoMoPay';
-    const MOMOPAY_METHOD_DETAIL               = 'Momopay';
-    const SCANTOPAY_DESCRIPTION              = 'MasterPass';
-    const SAMSUNG_DESCRIPTION                = 'Samsung Pay';
-    const APPLE_DESCRIPTION                  = 'ApplePay';
-    const RCS_DESCRIPTION                    = 'RCS';
+    const CREDIT_CARD_DESCRIPTION     = 'Card';
+    const BANK_TRANSFER_DESCRIPTION   = 'SiD Secure EFT';
+    const BANK_TRANSFER_METHOD_DETAIL = 'SID';
+    const ZAPPER_DESCRIPTION          = 'Zapper';
+    const SNAPSCAN_DESCRIPTION        = 'SnapScan';
+    const PAYPAL_DESCRIPTION          = 'PayPal';
+    const MOBICRED_DESCRIPTION        = 'Mobicred';
+    const MOMOPAY_DESCRIPTION         = 'MoMoPay';
+    const MOMOPAY_METHOD_DETAIL       = 'Momopay';
+    const SCANTOPAY_DESCRIPTION       = 'MasterPass';
+    const SAMSUNG_DESCRIPTION         = 'Samsung Pay';
+    const SAMSUNG_PAY_METHOD_DETAIL   = 'Samsungpay';
+    const APPLE_DESCRIPTION           = 'ApplePay';
+    const APPLEPAY_METHOD_DETAIL      = 'Applepay';
+    const RCS_DESCRIPTION             = 'RCS';
 
 
     const ON_CHECKOUT                         = ' on Checkout';
@@ -135,7 +137,7 @@ class WC_Gateway_PayGate extends WC_Payment_Gateway
     const ORDER_META_REFERENCE_PLACEHOLDER    = 'Add order meta to the payment reference using a meta key (e.g. _billing_first_name)';
     const LOGGING                             = 'logging';
 
-    public $version = '1.4.7';
+    public $version = '1.4.8';
 
     public $id = 'paygate';
 
@@ -176,9 +178,9 @@ class WC_Gateway_PayGate extends WC_Payment_Gateway
         self::PAYPAL_METHOD        => self::PAYPAL_DESCRIPTION,
         self::MOBICRED_METHOD      => self::MOBICRED_DESCRIPTION,
         self::MOMOPAY_METHOD       => self::MOMOPAY_METHOD_DETAIL,
-        self::SCANTOPAY_METHOD    => self::SCANTOPAY_DESCRIPTION,
-        self::APPLE_PAY            => self::APPLE_DESCRIPTION,
-        self::SAMSUNG_PAY          => self::SAMSUNG_DESCRIPTION,
+        self::SCANTOPAY_METHOD     => self::SCANTOPAY_DESCRIPTION,
+        self::APPLE_PAY            => self::APPLEPAY_METHOD_DETAIL,
+        self::SAMSUNG_PAY          => self::SAMSUNG_PAY_METHOD_DETAIL,
         self::RCS_METHOD           => self::RCS_DESCRIPTION
     ];
 
@@ -208,8 +210,8 @@ public function __construct()
         $this->init_form_fields();
         $this->init_settings();
         if (isset($this->settings[self::TESTMODE]) && $this->settings[self::TESTMODE] == 'no') {
-            $this->merchant_id    = isset($this->settings[self::PAYGATE_ID_LOWER_CASE]) ? $this->settings[self::PAYGATE_ID_LOWER_CASE] : '';
-            $this->encryption_key = isset($this->settings[self::ENCRYPTION_KEY]) ? $this->settings[self::ENCRYPTION_KEY] : '';
+            $this->merchant_id    = $this->settings[self::PAYGATE_ID_LOWER_CASE] ?? '';
+            $this->encryption_key = $this->settings[self::ENCRYPTION_KEY] ?? '';
         } else {
             $this->form_fields = WC_Gateway_PayGate_Admin_Actions::add_testmode_admin_settings_notice(
                 $this->form_fields
@@ -219,15 +221,11 @@ public function __construct()
 
         $wcsession = WC()->session;
 
-        if (self::$wc_logger === null) {
-            self::$wc_logger = wc_get_logger();
-        }
+        $this->setupWooLogger();
 
-        if (isset($this->settings[self::LOGGING]) && $this->settings[self::LOGGING] === 'yes') {
-            $this->logging = true;
-        }
+        $this->setupLoggingSetting();
 
-        if ( ! empty($_POST)) {
+        if (!empty($_POST)) {
             if (isset($_POST[self::NEW_PAYMENT_METHOD_SESSION])) {
                 if ($wcsession) {
                     $wcsession->set(self::NEW_PAYMENT_METHOD_SESSION, '1');
@@ -277,23 +275,19 @@ public function __construct()
             self::ID
         );
         $this->icon               = $this->get_plugin_url() . '/assets/images/PayGate_logo.svg';
-        if (isset($this->settings['paygateplus']) && $this->settings['paygateplus'] === 'yes') {
-            $this->icon = $this->get_plugin_url() . '/assets/images/PayGate_Plus_logo.svg';
-        }
+        $this->checkPaygatePlus();
         $this->has_fields = true;
         $this->supports   = array(
             'products',
         );
 
         // Define user set variables
-        $this->title             = isset($this->settings[self::TITLE]) ? $this->settings[self::TITLE] : '';
-        $this->order_button_text = isset($this->settings['button_text']) ? $this->settings['button_text'] : '';
-        $this->description       = isset($this->settings[self::DESCRIPTION]) ? $this->settings[self::DESCRIPTION] : '';
-        $this->payVault          = isset($this->settings['payvault']) ? $this->settings['payvault'] : '';
+        $this->title             = $this->settings[self::TITLE] ?? '';
+        $this->order_button_text = $this->settings['button_text'] ?? '';
+        $this->description       = $this->settings[self::DESCRIPTION] ?? '';
+        $this->payVault          = $this->settings['payvault'] ?? '';
 
-        if ($this->payVault == 'yes') {
-            $this->supports[] = 'tokenization';
-        }
+        $this->checkPayVault();
 
         $this->msg[self::MESSAGE]  = "";
         $this->msg[self::WC_CLASS] = "";
@@ -301,7 +295,7 @@ public function __construct()
         $this->notify_url   = add_query_arg('wc-api', 'WC_Gateway_PayGate_Notify', home_url('/'));
         $this->redirect_url = add_query_arg('wc-api', 'WC_Gateway_PayGate_Redirect', home_url('/'));
 
-        $order_meta_reference = isset($this->settings[self::ORDER_META_REFERENCE]) ? $this->settings[self::ORDER_META_REFERENCE] : '';
+        $order_meta_reference = $this->settings[self::ORDER_META_REFERENCE] ?? '';
         if (strlen($order_meta_reference) > 0) {
             $this->order_meta_reference = $order_meta_reference;
         }
@@ -309,9 +303,7 @@ public function __construct()
         $customPGReference = false;
 
 
-        if (isset($this->settings[self::PG_REFERENCE_TYPE]) && $this->settings[self::PG_REFERENCE_TYPE] === 'yes') {
-            $customPGReference = true;
-        }
+        $customPGReference = $this->setupCustomReference($customPGReference);
 
         $this->customPGReference = $customPGReference;
 
@@ -319,11 +311,11 @@ public function __construct()
         $this->setCardMethods();
     }
 
-    public static function show_cart_messages($messages)
+    public static function show_cart_messages($messages): void
     {
         if (isset($_GET['order_id'])) {
             $order_id      = filter_var($_GET['order_id'], FILTER_SANITIZE_NUMBER_INT);
-            $order = wc_get_order($order_id);
+            $order         = wc_get_order($order_id);
             $orderMessages = $order->get_meta('paygate_error');
             $orderMessage  = is_array($orderMessages) ? $orderMessages[count($orderMessages) - 1] : $orderMessages;
 
@@ -331,6 +323,72 @@ public static function show_cart_messages($messages)
         }
     }
 
+    /**
+     * @return void
+     */
+    public function checkCardMethodsEnabled(): void
+    {
+        foreach ($this->settings as $key => $setting) {
+            if (str_starts_with($key, 'pw3_') && $setting !== 'no' && $key !== 'pw3_credit_card') {
+                $this->pw3_card_methods_enabled = true;
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function setupWooLogger(): void
+    {
+        if (self::$wc_logger === null) {
+            self::$wc_logger = wc_get_logger();
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function setupLoggingSetting(): void
+    {
+        if (isset($this->settings[self::LOGGING]) && $this->settings[self::LOGGING] === 'yes') {
+            $this->logging = true;
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function checkPayVault(): void
+    {
+        if ($this->payVault == 'yes') {
+            $this->supports[] = 'tokenization';
+        }
+    }
+
+    /**
+     * @param true $customPGReference
+     *
+     * @return true
+     */
+    public function setupCustomReference($customPGReference): bool
+    {
+        if (isset($this->settings[self::PG_REFERENCE_TYPE]) && $this->settings[self::PG_REFERENCE_TYPE] === 'yes') {
+            $customPGReference = true;
+        }
+
+        return $customPGReference;
+    }
+
+    /**
+     * @return void
+     */
+    public function checkPaygatePlus(): void
+    {
+        if (isset($this->settings['paygateplus']) && $this->settings['paygateplus'] === 'yes') {
+            $this->icon = $this->get_plugin_url() . '/assets/images/PayGate_Plus_logo.svg';
+        }
+    }
+
     /**
      * Custom function added to overcome notice failures in recent versions
      *
@@ -340,7 +398,7 @@ public static function show_cart_messages($messages)
      */
     protected function custom_print_notices($return = false)
     {
-        if ( ! did_action('woocommerce_init')) {
+        if (!did_action('woocommerce_init')) {
             wc_doing_it_wrong(
                 __FUNCTION__,
                 __('This function should not be called before woocommerce_init.', 'woocommerce'),
@@ -361,7 +419,7 @@ protected function custom_print_notices($return = false)
                 $messages = array();
 
                 foreach ($all_notices[$notice_type] as $notice) {
-                    $messages[] = isset($notice['notice']) ? $notice['notice'] : $notice;
+                    $messages[] = $notice['notice'] ?? $notice;
                 }
 
                 wc_get_template(
@@ -384,7 +442,7 @@ protected function custom_print_notices($return = false)
     /**
      * Processes redirect from pay portal
      */
-    public function check_paygate_response()
+    public function check_paygate_response(): void
     {
         $check = new WC_Gateway_PayGate_Portal();
         $check->check_paygate_response();
@@ -393,18 +451,18 @@ public function check_paygate_response()
     /**
      * Processes IPN notification from pay portal
      */
-    public function check_paygate_notify_response()
+    public function check_paygate_notify_response(): void
     {
         $check = new WC_Gateway_PayGate_Portal();
         $check->check_paygate_notify_response();
     }
 
-    public function check_paygate_cron_response()
+    public function check_paygate_cron_response(): void
     {
         WC_Gateway_PayGate_Cron::paygate_order_query_cron();
     }
 
-    public function check_paygate_cron_response_site()
+    public function check_paygate_cron_response_site(): void
     {
         WC_Gateway_PayGate_Cron::paygate_order_query_cron_site();
     }
@@ -571,7 +629,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
-            self::PAYPAL              => array(
+            self::PAYPAL                => array(
                 self::TITLE         => __(self::ENABLE . self::PAYPAL_DESCRIPTION . self::ON_CHECKOUT, self::ID),
                 self::LABEL         => self::PAYPAL_DESCRIPTION . self::MUST_BE_ENABLED,
                 self::TYPE          => self::CHECKBOX,
@@ -595,7 +653,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
-            self::SCANTOPAY            => array(
+            self::SCANTOPAY             => array(
                 self::TITLE         => __(self::ENABLE . self::SCANTOPAY_DESCRIPTION . self::ON_CHECKOUT, self::ID),
                 self::LABEL         => self::SCANTOPAY_DESCRIPTION . self::MUST_BE_ENABLED,
                 self::TYPE          => self::CHECKBOX,
@@ -603,7 +661,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
-            self::APPLE_PAY => array(
+            self::APPLE_PAY             => array(
                 self::TITLE         => __(self::ENABLE . self::APPLE_DESCRIPTION . self::ON_CHECKOUT, self::ID),
                 self::LABEL         => self::APPLE_DESCRIPTION . self::MUST_BE_ENABLED,
                 self::TYPE          => self::CHECKBOX,
@@ -611,7 +669,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
-            self::SAMSUNG_PAY => array(
+            self::SAMSUNG_PAY           => array(
                 self::TITLE         => __(self::ENABLE . self::SAMSUNG_DESCRIPTION . self::ON_CHECKOUT, self::ID),
                 self::LABEL         => self::SAMSUNG_DESCRIPTION . self::MUST_BE_ENABLED,
                 self::TYPE          => self::CHECKBOX,
@@ -627,7 +685,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
-            self::PG_REFERENCE_TYPE              => array(
+            self::PG_REFERENCE_TYPE     => array(
                 self::TITLE         => __(self::PG_REFERENCE_DESCRIPTION, self::ID),
                 self::TYPE          => self::CHECKBOX,
                 self::DESCRIPTION   => __(self::PG_REFERENCE_PLACEHOLDER, self::ID),
@@ -698,14 +756,14 @@ public function admin_options()
      */
     public function payment_fields()
     {
-        if ($this->payVault == 'yes' && ! empty($_POST)) {
+        if ($this->payVault == 'yes' && !empty($_POST)) {
             // Display stored credit card selection
             $tokens       = WC_Payment_Tokens::get_customer_tokens(get_current_user_id(), $this->id);
             $defaultToken = WC_Payment_Tokens::get_customer_default_token(get_current_user_id());
             if (count($tokens) > 0) {
                 $this->showTokens($defaultToken, $tokens);
             } else {
-                $token = 'wc-' . esc_attr($this->id) . '-payment-token';
+                $token      = 'wc-' . esc_attr($this->id) . '-payment-token';
                 $new_method = 'wc-' . esc_attr($this->id) . '-new-payment-method';
                 echo <<<HTML
 <div name="$token" >
@@ -740,7 +798,13 @@ public function payment_fields()
                 $html .= '<tr>';
                 if ($pw_3_card_method['value'] !== '') {
                     $quickSelectPaymentMethods = true;
-                    $html                      .= '<td class="card_method" ><input type="radio" name="sub_payment_method" value="' . esc_attr($pw_3_card_method['value']) . '" >&nbsp;' . (esc_html($pw_3_card_method['description']) === "MasterPass" ? "ScanToPay" : esc_html($pw_3_card_method['description'])) . '</td>';
+                    $html                      .= '<td class="card_method" ><input type="radio" name="sub_payment_method" value="' . esc_attr(
+                            $pw_3_card_method['value']
+                        ) . '" >&nbsp;' . (esc_html(
+                                               $pw_3_card_method['description']
+                                           ) === "MasterPass" ? "ScanToPay" : esc_html(
+                            $pw_3_card_method['description']
+                        )) . '</td>';
                     $html                      .= '<td class="pay_method_image">';
                     $html                      .= '<img src="' . esc_url(
                             WC_HTTPS::force_https_url($pw_3_card_method['image'])
@@ -758,7 +822,7 @@ public function payment_fields()
                 jQuery( document ).ready(function() {
                     if (window.ApplePaySession === undefined) {
                         // Apple Pay is not available, so let's hide the specific input element
-                        var applePayElement = jQuery('input[value="CC-APPLEPAY"]');
+                        var applePayElement = jQuery('input[value="CC-Applepay"]');
                         
                         applePayElement.parent().parent().remove();
                     }
@@ -768,13 +832,13 @@ public function payment_fields()
 
             if ($quickSelectPaymentMethods) {
                 $allowed_tags = array_replace_recursive(
-                        wp_kses_allowed_html('post'),
+                    wp_kses_allowed_html('post'),
                     [
                         'script' => [],
-                        'input' => [
-                            'name' => true,
+                        'input'  => [
+                            'name'  => true,
                             'value' => true,
-                            'type' => true,
+                            'type'  => true,
                         ]
                     ]
                 );
@@ -783,9 +847,9 @@ public function payment_fields()
         }
     }
 
-    public function process_review_payment()
+    public function process_review_payment(): void
     {
-        if ( ! empty($_POST[self::ORDER_ID])) {
+        if (!empty($_POST[self::ORDER_ID])) {
             $this->process_payment(filter_var($_POST[self::ORDER_ID], FILTER_SANITIZE_STRING));
         }
     }
@@ -813,7 +877,7 @@ public function get_icon()
      * @since 1.0.0
      *
      */
-    public function process_payment($order_id)
+    public function process_payment($order_id): array
     {
         $order = new WC_Order($order_id);
 
@@ -868,7 +932,7 @@ public function get_ajax_return_data_json($order_id)
      * @since 1.0.0
      *
      */
-    public function show_message($content)
+    public function show_message($content): string
     {
         return '<div class="' . $this->msg[self::WC_CLASS] . '">' . $this->msg[self::MESSAGE] . '</div>' . $content;
     }
@@ -879,7 +943,7 @@ public function show_message($content)
      *
      * @since 1.0.0
      */
-    public function paygate_payment_scripts()
+    public function paygate_payment_scripts(): void
     {
         wp_enqueue_style(
             'paygate-checkout-css',
@@ -906,7 +970,7 @@ public function paygate_payment_scripts()
     /**
      * @return int|null
      */
-    public function get_order_id_order_pay()
+    public function get_order_id_order_pay(): ?int
     {
         global $wp;
 
@@ -938,18 +1002,18 @@ public function receipt_page($order_id)
             wp_kses_allowed_html('post'),
             [
                 'script' => [],
-                'form' => [
+                'form'   => [
                     'action' => true,
                     'method' => true,
-                    'id' => true,
-                    'class' => true,
+                    'id'     => true,
+                    'class'  => true,
                 ],
-                'input' => [
-                    'name' => true,
-                    'type' => true,
+                'input'  => [
+                    'name'  => true,
+                    'type'  => true,
                     'value' => true,
                     'class' => true,
-                    'id' => true,
+                    'id'    => true,
                 ]
             ]
         );
@@ -1042,8 +1106,7 @@ public static function getCardMethods(): array
     protected function setCardMethods()
     {
         if (isset($this->settings[self::CREDIT_CARD])) {
-
-            $this->pw3_card_methods['credit_card']   =  array(
+            $this->pw3_card_methods['credit_card']   = array(
                 'description' => self::CREDIT_CARD_DESCRIPTION,
                 'value'       => isset($this->settings[self::CREDIT_CARD]) && $this->settings[self::CREDIT_CARD] == 'yes' ? self::CREDIT_CARD_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/mastercard-visa.svg',
@@ -1063,7 +1126,7 @@ protected function setCardMethods()
                 'value'       => isset($this->settings[self::SNAPSCAN]) && $this->settings[self::SNAPSCAN] == 'yes' ? self::SNAPSCAN_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/snapscan.svg',
             );
-            $this->pw3_card_methods['paypal']      = array(
+            $this->pw3_card_methods['paypal']        = array(
                 'description' => self::PAYPAL_DESCRIPTION,
                 'value'       => isset($this->settings[self::PAYPAL]) && $this->settings[self::PAYPAL] == 'yes' ? self::PAYPAL_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/paypal.svg',
@@ -1078,12 +1141,12 @@ protected function setCardMethods()
                 'value'       => isset($this->settings[self::MOMOPAY]) && $this->settings[self::MOMOPAY] == 'yes' ? self::MOMOPAY_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/momopay.svg',
             );
-            $this->pw3_card_methods['scantopay']    = array(
+            $this->pw3_card_methods['scantopay']     = array(
                 'description' => self::SCANTOPAY_DESCRIPTION,
                 'value'       => isset($this->settings[self::SCANTOPAY]) && $this->settings[self::SCANTOPAY] == 'yes' ? self::SCANTOPAY_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/scan-to-pay.svg',
             );
-            $this->pw3_card_methods['applepay']    = array(
+            $this->pw3_card_methods['applepay']      = array(
                 'description' => self::APPLE_DESCRIPTION,
                 'value'       => isset($this->settings[self::APPLE_PAY]) && $this->settings[self::APPLE_PAY] == 'yes' ? self::APPLE_PAY : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/apple-pay.svg',
@@ -1093,7 +1156,7 @@ protected function setCardMethods()
                 'value'       => isset($this->settings[self::SAMSUNG_PAY]) && $this->settings[self::SAMSUNG_PAY] == 'yes' ? self::SAMSUNG_PAY : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/samsung-pay.svg',
             );
-            $this->pw3_card_methods['rcs']    = array(
+            $this->pw3_card_methods['rcs']           = array(
                 'description' => self::RCS_DESCRIPTION,
                 'value'       => isset($this->settings[self::RCS_METHOD]) && $this->settings[self::RCS_METHOD] == 'yes' ? self::RCS_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/rcs.svg',
@@ -1101,21 +1164,15 @@ protected function setCardMethods()
         }
 
         $this->pw3_card_methods = apply_filters('fnb_paygate_payweb_payment_types', $this->pw3_card_methods)
-        ?? $this->pw3_card_methods;
+                                  ?? $this->pw3_card_methods;
 
-        foreach ($this->settings as $key => $setting) {
-            if (strpos($key, 'pw3_') === 0) {
-                if ($setting !== 'no' && $key !== 'pw3_credit_card') {
-                    $this->pw3_card_methods_enabled = true;
-                }
-            }
-        }
+        $this->checkCardMethodsEnabled();
     }
 
     /**
      * Helper for constructor
      */
-    protected function addActions()
+    protected function addActions(): void
     {
         add_action(
             'woocommerce_api_wc_gateway_paygate_redirect',
@@ -1172,7 +1229,8 @@ protected function addActions()
             array(
                 $this,
                 'receipt_page',
-            )
+            ),
+            99
         );
 
         add_action('wp_ajax_order_pay_payment', array($this, 'process_review_payment'));
@@ -1186,7 +1244,7 @@ protected function addActions()
      *
      * @return array|object|null
      */
-    protected static function getOrderNotes($order_id)
+    protected static function getOrderNotes($order_id): object|array|null
     {
         global $wpdb;
 
@@ -1230,8 +1288,8 @@ protected function showTokens($defaultToken, $tokens)
                 }
 
                 $option_value = esc_attr($token->get_token());
-                $card_type = esc_html($cardType);
-                $last4 = esc_html($token->get_last4());
+                $card_type    = esc_html($cardType);
+                $last4        = esc_html($token->get_last4());
                 echo <<<HTML
                      <option value="{$option_value}" {$selected}>Use {$card_type} ending in {$last4}</option> }
 HTML;
diff --git a/classes/WC_Gateway_PayGate_Admin_Actions.php b/classes/WC_Gateway_PayGate_Admin_Actions.php
index e34c6dd..b372072 100644
--- a/classes/WC_Gateway_PayGate_Admin_Actions.php
+++ b/classes/WC_Gateway_PayGate_Admin_Actions.php
@@ -1,13 +1,13 @@
 <?php
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
  * Released under the GNU General Public License
  */
 
-if ( ! defined('ABSPATH')) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -78,12 +78,12 @@ public static function paygate_order_query_action($order)
         $transactionStatus = $gwp->paywebQueryStatus($response);
 
         if ((int)$transactionStatus === 1) {
-            if ( ! $order->has_status(self::PROCESSING) && ! $order->has_status(self::COMPLETED)) {
+            if (!$order->has_status(self::PROCESSING) && !$order->has_status(self::COMPLETED)) {
                 $order->payment_complete();
                 $responseText .= "<br>Order set to \"Processing\"";
             }
         } else {
-            if ( ! $order->has_status(self::FAILED)) {
+            if (!$order->has_status(self::FAILED)) {
                 $order->update_status(self::FAILED);
             }
         }
diff --git a/classes/WC_Gateway_PayGate_Blocks_Support.php b/classes/WC_Gateway_PayGate_Blocks_Support.php
index 79a406a..f043dde 100644
--- a/classes/WC_Gateway_PayGate_Blocks_Support.php
+++ b/classes/WC_Gateway_PayGate_Blocks_Support.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -30,7 +30,7 @@ final class WC_Gateway_PayGate_Blocks_Support extends AbstractPaymentMethodType
      */
     public function initialize()
     {
-        $this->settings = get_option('woocommerce_paygate_settings', []);
+        $this->settings        = get_option('woocommerce_paygate_settings', []);
         $this->paygate_gateway = new WC_Gateway_PayGate();
     }
 
@@ -42,7 +42,7 @@ public function initialize()
     public function is_active()
     {
         $payment_gateways_class = WC()->payment_gateways();
-        $payment_gateways = $payment_gateways_class->payment_gateways();
+        $payment_gateways       = $payment_gateways_class->payment_gateways();
 
         return $payment_gateways['paygate']->is_available();
     }
@@ -55,14 +55,14 @@ public function is_active()
     public function get_payment_method_script_handles()
     {
         $parent_directory_path = dirname(__FILE__, 2);
-        $plugin_url = $this->paygate_gateway->get_plugin_url();
-        $indexJsPath = $plugin_url . '/assets/js/index.js';
-        $asset_path = $parent_directory_path . '/assets/js/index.asset.php';
-        $version = $this->paygate_gateway->version;
-        $dependencies = [];
+        $plugin_url            = $this->paygate_gateway->get_plugin_url();
+        $indexJsPath           = $plugin_url . '/assets/js/index.js';
+        $asset_path            = $parent_directory_path . '/assets/js/index.asset.php';
+        $version               = $this->paygate_gateway->version;
+        $dependencies          = [];
         if (file_exists($asset_path)) {
-            $asset = require $asset_path;
-            $version = is_array($asset) && isset($asset['version'])
+            $asset        = require $asset_path;
+            $version      = is_array($asset) && isset($asset['version'])
                 ? $asset['version']
                 : $version;
             $dependencies = is_array($asset) && isset($asset['dependencies'])
@@ -80,6 +80,7 @@ public function get_payment_method_script_handles()
             'wc-paygate-blocks-integration',
             'woocommerce'
         );
+
         return ['wc-paygate-blocks-integration'];
     }
 
@@ -91,10 +92,10 @@ public function get_payment_method_script_handles()
     public function get_payment_method_data()
     {
         return [
-            'title' => $this->get_setting('title'),
+            'title'       => $this->get_setting('title'),
             'description' => $this->get_setting('description'),
-            'supports' => $this->get_supported_features(),
-            'logo_url' => $this->paygate_gateway->get_plugin_url() . '/assets/images/PayGate_logo.svg',
+            'supports'    => $this->get_supported_features(),
+            'logo_url'    => $this->paygate_gateway->get_plugin_url() . '/assets/images/PayGate_logo.svg',
         ];
     }
 
@@ -106,6 +107,7 @@ public function get_payment_method_data()
     public function get_supported_features()
     {
         $payment_gateways = WC()->payment_gateways->payment_gateways();
+
         return $payment_gateways['paygate']->supports;
     }
 }
diff --git a/classes/WC_Gateway_PayGate_Cron.php b/classes/WC_Gateway_PayGate_Cron.php
index b38b98d..ca72a4b 100644
--- a/classes/WC_Gateway_PayGate_Cron.php
+++ b/classes/WC_Gateway_PayGate_Cron.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -9,7 +9,7 @@
 
 class WC_Gateway_PayGate_Cron extends WC_Gateway_PayGate
 {
-    const LOGGING = 'logging';
+    const LOGGING        = 'logging';
     const CUTOFF_MINUTES = 30;
 
     public static function paygate_order_query_cron()
@@ -41,9 +41,9 @@ public static function paygate_order_query_cron_site()
         $logger = wc_get_logger();
         $logger->add('payweb-site-cron', 'Redirected to here');
 
-        $cutoffTime = new DateTime('now', new DateTimeZone('UTC'));
+        $cutoffTime    = new DateTime('now', new DateTimeZone('UTC'));
         $cutoffMinutes = self::CUTOFF_MINUTES;
-        $cutoff = $cutoffTime->sub(new DateInterval("P0DT0H{$cutoffMinutes}M"))->getTimestamp();
+        $cutoff        = $cutoffTime->sub(new DateInterval("P0DT0H{$cutoffMinutes}M"))->getTimestamp();
 
         // Load the settings
         $settings = get_option('woocommerce_paygate_settings', false);
@@ -57,7 +57,7 @@ public static function paygate_order_query_cron_site()
         $logging ? $logger->add('payweb-site-cron', 'Starting site cron job') : '';
 
         $orders = wc_get_orders([
-                                    'post_status'   => 'wc-pending',
+                                    'post_status'  => 'wc-pending',
                                     'date_created' => '<' . $cutoff,
                                 ]);
         $logging ? $logger->add('payweb-site-cron', 'Orders: ' . serialize($orders)) : '';
diff --git a/classes/WC_Gateway_PayGate_Portal.php b/classes/WC_Gateway_PayGate_Portal.php
index f277261..a9361f9 100644
--- a/classes/WC_Gateway_PayGate_Portal.php
+++ b/classes/WC_Gateway_PayGate_Portal.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -64,39 +64,37 @@ public function initiate_transaction($order_id)
         $this->data_to_send['USER3'] = 'woocommerce-v' . $this->version;
 
         $newPaymentMethod = false;
-        if($wcsession = WC()->session) {
-            $t = $wcsession->get(self::NEW_PAYMENT_METHOD_SESSION);
-            if(isset($t) && $t === '1') {
-            $newPaymentMethod = true;
-        }
+        if ($wcsession = WC()->session) {
+            $t                = $wcsession->get(self::NEW_PAYMENT_METHOD_SESSION);
+            $newPaymentMethod = $this->isPaymentMethodNew($t, $newPaymentMethod);
         }
 
         if ($vaultableMethod && $this->payVault == 'yes') {
             // Tokenisation is enabled for store
             // Check if customer has existing tokens or chooses to tokenise
             $custVault = get_post_meta($customer_id, 'wc-' . $this->id . self::NEW_PAYMENT_METHOD, true);
-            $newVault = $noVault = false;
-            if($wcsession = WC()->session) {
+            $newVault  = $noVault = false;
+            if ($wcsession = WC()->session) {
                 $newVault = $wcsession->get('wc-' . $this->id . self::PAYMENT_TOKEN) === 'new';
-                $noVault = $wcsession->get('wc-' . $this->id . self::PAYMENT_TOKEN) === 'no';
+                $noVault  = $wcsession->get('wc-' . $this->id . self::PAYMENT_TOKEN) === 'no';
                 $tokenSet = $wcsession->get('wc-' . $this->id . self::PAYMENT_TOKEN);
             }
 
             switch ($vaultableMethod) {
-                case ( ! $custVault && $newPaymentMethod):
-                case ($newVault):
+                case !$custVault && $newPaymentMethod:
+                case $newVault:
                     // Customer requesting remember card number
                     update_post_meta($customer_id, 'wc-' . $this->id . self::NEW_PAYMENT_METHOD, true);
                     $this->data_to_send[self::VAULT] = 1;
                     break;
-                case ($noVault):
+                case $noVault:
                     update_post_meta($customer_id, 'wc-' . $this->id . self::NEW_PAYMENT_METHOD, false);
                     break;
-                case (isset($tokenSet)):
+                case isset($tokenSet):
                     $this->data_to_send[self::VAULT_ID] = $tokenSet;
                     unset($this->data_to_send['PAY_METHOD_DETAIL']);
                     break;
-                case ($newPaymentMethod):
+                case $newPaymentMethod:
                     $this->data_to_send[self::VAULT] = 1;
                     break;
                 default:
@@ -128,10 +126,10 @@ public function initiate_transaction($order_id)
         if (empty($this->initiate_response['body']) || array_key_exists(
                 'ERROR',
                 $parsed_response
-            ) || ! array_key_exists(self::PAY_REQUEST_ID, $parsed_response)) {
+            ) || !array_key_exists(self::PAY_REQUEST_ID, $parsed_response)) {
             $this->msg[self::WC_CLASS] = 'woocommerce-error';
             $this->msg[self::MESSAGE]  = "Thank you for shopping with us. However, we were unable to initiate your payment. Please try again.";
-            if ( ! $order->has_status(self::FAILED)) {
+            if (!$order->has_status(self::FAILED)) {
                 $order->add_order_note(
                     'Response from initiating payment:' . print_r(
                         $this->data_to_send,
@@ -154,7 +152,7 @@ public function initiate_transaction($order_id)
                 )
             );
         } else {
-            if($wcsession = WC()->session) {
+            if ($wcsession = WC()->session) {
                 $wcsession->set('PARSED_RESPONSE', $parsed_response);
             }
         }
@@ -166,7 +164,7 @@ public function initiate_transaction($order_id)
             'Initiate on Paygate started. Pay Request Id: ' . $parsed_response[self::PAY_REQUEST_ID]
         );
 
-        if ( ! $order->has_status(self::PENDING)) {
+        if (!$order->has_status(self::PENDING)) {
             $order->update_status(self::PENDING);
         }
 
@@ -192,26 +190,19 @@ public function generate_paygate_form($order_id)
             WC()->cart->empty_cart();
         }
 
-        if ( ! is_wp_error($parsed_response)) {
+        if (!is_wp_error($parsed_response)) {
             unset($parsed_response[self::CHECKSUM]);
-            $checksum = esc_attr(md5(implode('', $parsed_response) . $this->encryption_key));
-
-            $heading    = __('Thank you for your order, please click the button below to pay via Paygate.', self::ID);
-            $buttonText = esc_attr__($this->order_button_text, self::ID);
-            $cancelUrl  = esc_url($order->get_cancel_order_url());
-            $cancelText = esc_html__('Cancel order &amp; restore cart', self::ID);
-            $process_url = esc_url($this->process_url);
+            $checksum       = esc_attr(md5(implode('', $parsed_response) . $this->encryption_key));
+            $buttonText     = esc_attr__($this->order_button_text, self::ID);
+            $cancelUrl      = esc_url($order->get_cancel_order_url());
+            $cancelText     = esc_html__('Cancel order &amp; restore cart', self::ID);
+            $process_url    = esc_url($this->process_url);
             $pay_request_id = esc_attr($parsed_response[self::PAY_REQUEST_ID]);
 
             return <<<HTML
-<p>{$heading}</p>
 <form action="{$process_url}" method="post" id="paygate_payment_form">
     <input name="PAY_REQUEST_ID" type="hidden" value="{$pay_request_id}" />
     <input name="CHECKSUM" type="hidden" value="{$checksum}" />
-    <!-- Button Fallback -->
-    <div class="payment_buttons">
-        <input type="submit" class="button alt" id="submit_paygate_payment_form" value="{$buttonText}" /> <a class="button cancel" href="{$cancelUrl}">{$cancelText}</a>
-    </div>
 </form>
 <script>
 jQuery(document).ready(function(){
@@ -233,8 +224,7 @@ public function generate_paygate_form($order_id)
         });
     });
 
-    jQuery("#submit_paygate_payment_form").click();
-    jQuery("#submit_paygate_payment_form").attr("disabled", true);
+    jQuery("#paygate_payment_form").submit();
 });
 </script>
 HTML;
@@ -248,7 +238,7 @@ public function generate_paygate_form($order_id)
      *
      * @since 1.0.0
      */
-    public function check_paygate_response()
+    public function check_paygate_response(): void
     {
         $this->logging ? self::$wc_logger->add('paygatepayweb', 'Redirect POST: ' . json_encode($_POST)) : '';
         // Sanitise GET and POST arrays
@@ -256,11 +246,11 @@ public function check_paygate_response()
         $get  = $this->sanitizeFields($_GET);
 
         // Only process if IPN is disabled
-        if ( ! (isset($get['gid']) && isset($post[self::PAY_REQUEST_ID]))) {
+        if (!(isset($get['gid']) && isset($post[self::PAY_REQUEST_ID]))) {
             die();
         }
 
-        if ( ! $order_id = $get['gid']) {
+        if (!$order_id = $get['gid']) {
             wp_redirect(get_permalink(wc_get_page_id('myaccount')));
         }
 
@@ -269,7 +259,7 @@ public function check_paygate_response()
         }
 
         $transient = get_transient('PAYGATE_PAYWEB_RED_' . $post[self::PAY_REQUEST_ID]);
-        if($transient !== false) {
+        if ($transient !== false) {
             exit();
         }
         set_transient('PAYGATE_PAYWEB_RED_' . $post[self::PAY_REQUEST_ID], $post[self::PAY_REQUEST_ID], 15);
@@ -281,7 +271,7 @@ public function check_paygate_response()
         $status         = isset($post[self::TRANSACTION_STATUS]) ? $post[self::TRANSACTION_STATUS] : "";
         $reference      = $this->getOrderReference($order);
 
-        if ( ! $this->validateChecksum($post, $reference) && !$order->is_paid()) {
+        if (!$this->validateChecksum($post, $reference) && !$order->is_paid()) {
             $order->update_status(self::PENDING, __('Checksum failed'));
             exit();
         }
@@ -309,7 +299,7 @@ public function check_paygate_response()
 
         parse_str($response['body'], $parsed_response);
 
-        if((int)$status === 1) {
+        if ((int)$status === 1) {
             $this->vaultCard($parsed_response, $customer_id);
         }
 
@@ -327,13 +317,11 @@ public function check_paygate_response()
      *
      * @since 1.0.0
      */
-    public function check_paygate_notify_response()
+
+    public function check_paygate_notify_response(): void
     {
         // Log notify response for debugging purposes
-        if($this->logging) {
-            self::$wc_logger->add('paygatepayweb', 'Notify POST: ' . json_encode($_POST));
-            self::$wc_logger->add('paygatepayweb', 'Notify GET: ' . json_encode($_GET));
-        }
+        $this->logIPNRequest();
 
         // Tell Paygate notify we have received
         echo 'OK';
@@ -342,7 +330,7 @@ public function check_paygate_notify_response()
             exit();
         }
 
-        if ( ! isset($_POST)) {
+        if (!isset($_POST)) {
             exit();
         }
 
@@ -375,24 +363,11 @@ public function check_paygate_notify_response()
         }
 
         // Verify security signature
-        if ( ! $this->validateChecksumNotify($paygate_data)) {
-            if($this->logging){
-                self::$wc_logger->add('paygatepayweb', 'Failed to validate checksum with data ' . json_encode($paygate_data));
-            }
-            if ( ! $order->has_status(self::FAILED)) {
-                $order->add_order_note('Failed Response via Notify, ' . $this->error_desc . self::BR);
-                $order->update_status(self::PENDING, __('Checksum failed in notify'));
-            }
-            exit();
-        } else {
-            if($this->logging){
-                self::$wc_logger->add('paygatepayweb', 'Validated checksum with data ' . json_encode($paygate_data));
-            }
-        }
+        $this->verifySecuritySignature($paygate_data, $order);
 
         $customer_id = $order->get_customer_id();
 
-        if((int)$paygate_data[self::TRANSACTION_STATUS] === 1) {
+        if ((int)$paygate_data[self::TRANSACTION_STATUS] === 1) {
             $this->vaultCard($paygate_data, $customer_id);
         }
 
@@ -400,9 +375,9 @@ public function check_paygate_notify_response()
             exit();
         }
 
-        $transaction_id = isset($paygate_data[self::TRANSACTION_ID]) ? $paygate_data[self::TRANSACTION_ID] : "";
-        $result_desc    = isset($paygate_data[self::RESULT_DESC]) ? $paygate_data[self::RESULT_DESC] : "";
-        $pay_request_id = isset($paygate_data[self::PAY_REQUEST_ID]) ? $paygate_data[self::PAY_REQUEST_ID] : "";
+        $transaction_id = $paygate_data[self::TRANSACTION_ID] ?? "";
+        $result_desc    = $paygate_data[self::RESULT_DESC] ?? "";
+        $pay_request_id = $paygate_data[self::PAY_REQUEST_ID] ?? "";
 
         switch ((int)$paygate_data[self::TRANSACTION_STATUS]) {
             case 1:
@@ -420,8 +395,8 @@ public function check_paygate_notify_response()
                 exit;
                 break;
             default:
-                if ( ! $order->has_status(self::PENDING)) {
-                    if($this->logging){
+                if (!$order->has_status(self::PENDING)) {
+                    if ($this->logging) {
                         self::$wc_logger->add('paygatepayweb', 'Reached default in switch statement');
                     }
                     $order->add_order_note(
@@ -442,7 +417,7 @@ public function check_paygate_notify_response()
      *
      * @return mixed
      */
-    public function paywebQuery($payRequestId, $order)
+    public function paywebQuery($payRequestId, $order): mixed
     {
         $reference = $this->getOrderReference($order);
 
@@ -478,9 +453,9 @@ public function paywebQuery($payRequestId, $order)
      */
     public function paywebQueryText($response, $payRequestId)
     {
-        $transactionStatus = ! empty($response[self::TRANSACTION_STATUS]) ? $response[self::TRANSACTION_STATUS] : 'Null';
-        $resultCode        = ! empty($response[self::RESULT_CODE]) ? $response[self::RESULT_CODE] : 'Null';
-        $resultDesc        = ! empty($response[self::RESULT_DESC]) ? $response[self::RESULT_DESC] : 'Null';
+        $transactionStatus = !empty($response[self::TRANSACTION_STATUS]) ? $response[self::TRANSACTION_STATUS] : 'Null';
+        $resultCode        = !empty($response[self::RESULT_CODE]) ? $response[self::RESULT_CODE] : 'Null';
+        $resultDesc        = !empty($response[self::RESULT_DESC]) ? $response[self::RESULT_DESC] : 'Null';
 
         return <<<RT
 Pay_Request_Id: {$payRequestId}<br>
@@ -495,9 +470,81 @@ public function paywebQueryText($response, $payRequestId)
      *
      * @return string
      */
-    public function paywebQueryStatus($response)
+    public function paywebQueryStatus($response): string
+    {
+        return !empty($response[self::TRANSACTION_STATUS]) ? $response[self::TRANSACTION_STATUS] : 'Null';
+    }
+
+    /**
+     * @param $t
+     * @param true $newPaymentMethod
+     *
+     * @return true
+     */
+    public function isPaymentMethodNew($t, $newPaymentMethod): bool
+    {
+        if (isset($t) && $t === '1') {
+            $newPaymentMethod = true;
+        }
+
+        return $newPaymentMethod;
+    }
+
+    /**
+     * @return void
+     */
+    public function logIPNRequest(): void
+    {
+        if ($this->logging) {
+            self::$wc_logger->add('paygatepayweb', 'Notify POST: ' . json_encode($_POST));
+            self::$wc_logger->add('paygatepayweb', 'Notify GET: ' . json_encode($_GET));
+        }
+    }
+
+    /**
+     * @param array $paygate_data
+     * @param $order
+     *
+     * @return void
+     */
+    public function verifySecuritySignature(array $paygate_data, $order): void
+    {
+        if (!$this->validateChecksumNotify($paygate_data)) {
+            if ($this->logging) {
+                self::$wc_logger->add(
+                    'paygatepayweb',
+                    'Failed to validate checksum with data ' . json_encode($paygate_data)
+                );
+            }
+            if (!$order->has_status(self::FAILED)) {
+                $order->add_order_note('Failed Response via Notify, ' . $this->error_desc . self::BR);
+                $order->update_status(self::PENDING, __('Checksum failed in notify'));
+            }
+            exit();
+        } else {
+            if ($this->logging) {
+                self::$wc_logger->add('paygatepayweb', 'Validated checksum with data ' . json_encode($paygate_data));
+            }
+        }
+    }
+
+    /**
+     * @param $order
+     *
+     * @return void
+     */
+    public function alternativeCartMechanism($order): void
     {
-        return ! empty($response[self::TRANSACTION_STATUS]) ? $response[self::TRANSACTION_STATUS] : 'Null';
+        if (count($order->get_items()) > 0) {
+            foreach ($order->get_items() as $product) {
+                $product_id   = isset($product['product_id']) ? (int)$product['product_id'] : 0;
+                $quantity     = isset($product['quantity']) ? (int)$product['quantity'] : 1;
+                $variation_id = isset($product['variation_id']) ? (int)$product['variation_id'] : 0;
+                $variation    = isset($product['variation']) ? (array)$product['variation'] : array();
+                WC()->cart->add_to_cart($product_id, $quantity, $variation_id, $variation);
+            }
+            WC()->cart->calculate_totals();
+        }
     }
 
     /**
@@ -505,7 +552,7 @@ public function paywebQueryStatus($response)
      *
      * @return string
      */
-    protected function getOrderReference($order)
+    protected function getOrderReference($order): string
     {
         $order_id  = $order->get_id();
         $reference = $order_id . '-' . $order->get_order_number();
@@ -517,7 +564,7 @@ protected function getOrderReference($order)
         // Set reference if custom order meta is set
         if ($this->order_meta_reference != '') {
             $reference_meta = $order->get_meta(sanitize_key($this->order_meta_reference), true);
-            $reference      .= ! empty($reference_meta) ? '-' . $reference_meta : '';
+            $reference      .= !empty($reference_meta) ? '-' . $reference_meta : '';
         }
 
         return $reference;
@@ -526,11 +573,11 @@ protected function getOrderReference($order)
     /**
      * @return bool
      */
-    protected function setVaultableMethod()
+    protected function setVaultableMethod(): bool
     {
-        $wcsession = WC()->session;
+        $wcsession        = WC()->session;
         $subpaymentmethod = $wcsession->get(self::SUB_PAYMENT_METHOD);
-        $vaultableMethod = false;
+        $vaultableMethod  = false;
         if (isset($subpaymentmethod) && $subpaymentmethod != '') {
             $this->data_to_send['PAY_METHOD'] = substr($subpaymentmethod, 0, 2);
             if (isset($this->paymentTypes[$subpaymentmethod]) && $this->paymentTypes[$subpaymentmethod] != '') {
@@ -559,16 +606,7 @@ protected function processOrderFinal($status, $order, $transaction_id, $result_d
     {
         if ($this->settings[self::ALTERNATECARTHANDLING] == 'yes') {
             // Alternative cart mechanism
-            if (count($order->get_items()) > 0) {
-                foreach ($order->get_items() as $product) {
-                    $product_id   = isset($product['product_id']) ? (int)$product['product_id'] : 0;
-                    $quantity     = isset($product['quantity']) ? (int)$product['quantity'] : 1;
-                    $variation_id = isset($product['variation_id']) ? (int)$product['variation_id'] : 0;
-                    $variation    = isset($product['variation']) ? (array)$product['variation'] : array();
-                    WC()->cart->add_to_cart($product_id, $quantity, $variation_id, $variation);
-                }
-                WC()->cart->calculate_totals();
-            }
+            $this->alternativeCartMechanism($order);
         }
         switch ($status) {
             case 1:
@@ -587,13 +625,13 @@ protected function processOrderFinal($status, $order, $transaction_id, $result_d
                 break;
             default:
                 if ($this->settings[self::DISABLENOTIFY] == 'yes') {
-                    if ( ! $order->has_status(self::PENDING)) {
+                    if (!$order->has_status(self::PENDING)) {
                         $order->add_order_note(
                             'Response via ' . $this->settings[self::PAYMENT_TYPE] . ', RESULT_DESC: ' . $result_desc . self::PAYGATE_TRANS_ID . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                         );
                         if (!$order->is_paid()) {
-                        $order->update_status(self::PENDING);
-                    }
+                            $order->update_status(self::PENDING);
+                        }
                     }
 
                     $this->add_notice(
@@ -611,10 +649,10 @@ protected function processOrderFinal($status, $order, $transaction_id, $result_d
     /**
      * @param $redirect_link
      */
-    protected function redirectAfterOrder($redirect_link)
+    protected function redirectAfterOrder($redirect_link): void
     {
         $redirect_link = str_replace('&amp;', '&', $redirect_link);
-            wp_redirect($redirect_link);
+        wp_redirect($redirect_link);
     }
 
     /**
@@ -622,7 +660,7 @@ protected function redirectAfterOrder($redirect_link)
      * @param $transaction_id
      * @param $pay_request_id
      */
-    protected function processOrderFinalSuccess($order, $transaction_id, $pay_request_id, $notify = 'redirect')
+    protected function processOrderFinalSuccess($order, $transaction_id, $pay_request_id, $notify = 'redirect'): void
     {
         WC()->cart->empty_cart();
 
@@ -632,7 +670,7 @@ protected function processOrderFinalSuccess($order, $transaction_id, $pay_reques
                     $order->add_order_note(
                         'Response via Redirect: Transaction successful<br/>Paygate Trans Id: ' . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                     );
-                    if ( ! $order->has_status(self::PROCESSING) && ! $order->has_status(self::COMPLETED)) {
+                    if (!$order->has_status(self::PROCESSING) && !$order->has_status(self::COMPLETED)) {
                         $order->payment_complete();
                     }
                 }
@@ -642,7 +680,7 @@ protected function processOrderFinalSuccess($order, $transaction_id, $pay_reques
                     $order->add_order_note(
                         'Response via Notify: Transaction successful<br/>Paygate Trans Id: ' . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                     );
-                    if ( ! $order->has_status(self::PROCESSING) && ! $order->has_status(self::COMPLETED)) {
+                    if (!$order->has_status(self::PROCESSING) && !$order->has_status(self::COMPLETED)) {
                         $order->payment_complete();
                     }
                 }
@@ -661,17 +699,17 @@ protected function processOrderFinalSuccess($order, $transaction_id, $pay_reques
      * @param $transaction_id
      * @param $pay_request_id
      */
-    protected function processOrderFinalCancel($order, $transaction_id, $pay_request_id)
+    protected function processOrderFinalCancel($order, $transaction_id, $pay_request_id): void
     {
         if ($this->settings[self::DISABLENOTIFY] == 'yes') {
-            if ( ! $order->has_status(self::FAILED)) {
+            if (!$order->has_status(self::FAILED)) {
                 $order->add_order_note(
-                    'Response via Redirect: User cancelled transaction<br/>'  . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
+                    'Response via Redirect: User cancelled transaction<br/>' . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
                 $order->update_status(self::FAILED);
             }
         } else {
-            if ( ! $order->has_status(self::FAILED)) {
+            if (!$order->has_status(self::FAILED)) {
                 $order->add_order_note(
                     'Response via Notify, User cancelled transaction<br/>' . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
@@ -689,17 +727,17 @@ protected function processOrderFinalCancel($order, $transaction_id, $pay_request
      * @param $pay_request_id
      * @param $result_desc
      */
-    protected function processOrderFinalFail($order, $transaction_id, $pay_request_id, $result_desc)
+    protected function processOrderFinalFail($order, $transaction_id, $pay_request_id, $result_desc): void
     {
         if ($this->settings[self::DISABLENOTIFY] == 'yes') {
-            if ( ! $order->has_status(self::FAILED)) {
+            if (!$order->has_status(self::FAILED)) {
                 $order->add_order_note(
                     'Response via Redirect, RESULT_DESC: ' . $result_desc . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
                 $order->update_status(self::FAILED);
             }
         } else {
-            if ( ! $order->has_status(self::FAILED)) {
+            if (!$order->has_status(self::FAILED)) {
                 $order->add_order_note(
                     'Response via Notify, RESULT_DESC: ' . $result_desc . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
@@ -715,7 +753,7 @@ protected function processOrderFinalFail($order, $transaction_id, $pay_request_i
      * @param $parsed_response
      * @param $customer_id
      */
-    protected function vaultCard($parsed_response, $customer_id)
+    protected function vaultCard($parsed_response, $customer_id): void
     {
         if ($this->payVault == 'yes') {
             $this->vaultCard = get_post_meta(
@@ -737,11 +775,11 @@ protected function vaultCard($parsed_response, $customer_id)
      *
      * @return bool
      */
-    protected function validateChecksum($post, $reference)
+    protected function validateChecksum($post, $reference): bool
     {
         $pay_request_id = $post[self::PAY_REQUEST_ID];
-        $status         = isset($post[self::TRANSACTION_STATUS]) ? $post[self::TRANSACTION_STATUS] : "";
-        $checksum       = isset($post[self::CHECKSUM]) ? $post[self::CHECKSUM] : "";
+        $status         = $post[self::TRANSACTION_STATUS] ?? "";
+        $checksum       = $post[self::CHECKSUM] ?? "";
 
         $checksum_source = $this->merchant_id . $pay_request_id . $status . $reference . $this->encryption_key;
         $test_checksum   = md5($checksum_source);
@@ -757,8 +795,8 @@ protected function validateChecksumNotify($paygate_data)
                 $checkSumParams .= $val;
                 continue;
             }
-            if($key === 'AUTH_CODE') {
-                if($val === 'null') {
+            if ($key === 'AUTH_CODE') {
+                if ($val === 'null') {
                     $checkSumParams .= '';
                 } else {
                     $checkSumParams .= $val;
@@ -819,7 +857,7 @@ protected function saveToken($data, $customer_id)
             }
         }
 
-        if ( ! $exists) {
+        if (!$exists) {
             $token = new WC_Payment_Token_CC();
 
             $token->set_token($this->vaultId);
diff --git a/gateway-paygate.php b/gateway-paygate.php
index eded8a2..c904b7e 100755
--- a/gateway-paygate.php
+++ b/gateway-paygate.php
@@ -5,17 +5,17 @@
  * Description: Receive payments using the South African Paygate payments provider.
  * Author: Payfast (Pty) Ltd
  * Author URI: https://payfast.io/
- * Version: 1.4.7
+ * Version: 1.4.8
  * Requires at least: 5.6
- * Tested up to: 6.4.1
- * WC tested up to: 8.3.1
+ * Tested up to: 6.5.3
+ * WC tested up to: 8.9.1
  * WC requires at least: 6.0
  * Requires PHP: 8.0
  *
  * Developer: App Inlet (Pty) Ltd
  * Developer URI: https://www.appinlet.com/
  *
- * Copyright: © 2023 Payfast (Pty) Ltd.
+ * Copyright: © 2024 Payfast (Pty) Ltd.
  * License: GNU General Public License v3.0
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
  * Text Domain: paygate-payweb-for-woocommerce
@@ -29,6 +29,7 @@
  * @since 1.0.0
  * @noinspection PhpUnused
  */
+
 use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
 
 function woocommerce_paygate_init()
@@ -102,33 +103,35 @@ function paygate_add_cron_hook()
 
 function paygate_remove_cron_hook()
 {
-    while(wp_next_scheduled('paygate_query_cron_hook')) {
+    while (wp_next_scheduled('paygate_query_cron_hook')) {
         wp_clear_scheduled_hook('paygate_query_cron_hook');
     }
 }
 
-add_action( 'before_woocommerce_init', 'woocommerce_paygatepayweb_declare_hpos_compatibility' );
+add_action('before_woocommerce_init', 'woocommerce_paygatepayweb_declare_hpos_compatibility');
 
 /**
  * Declares support for HPOS.
  *
  * @return void
  */
-function woocommerce_paygatepayweb_declare_hpos_compatibility() {
-    if ( class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) ) {
-        \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+function woocommerce_paygatepayweb_declare_hpos_compatibility()
+{
+    if (class_exists('\Automattic\WooCommerce\Utilities\FeaturesUtil')) {
+        \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility('custom_order_tables', __FILE__, true);
     }
 }
 
-add_action( 'woocommerce_blocks_loaded', 'woocommerce_paygate_woocommerce_blocks_support' );
+add_action('woocommerce_blocks_loaded', 'woocommerce_paygate_woocommerce_blocks_support');
 
-function woocommerce_paygate_woocommerce_blocks_support() {
-    if ( class_exists( 'Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType' ) ) {
+function woocommerce_paygate_woocommerce_blocks_support()
+{
+    if (class_exists('Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType')) {
         require_once dirname(__FILE__) . '/classes/WC_Gateway_PayGate_Blocks_Support.php';
         add_action(
             'woocommerce_blocks_payment_method_type_registration',
-            function( Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
-                $payment_method_registry->register( new WC_Gateway_PayGate_Blocks_Support );
+            function (Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry) {
+                $payment_method_registry->register(new WC_Gateway_PayGate_Blocks_Support);
             }
         );
     }
diff --git a/readme.txt b/readme.txt
index 478a17f..84c360b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: appinlet
 Tags: ecommerce, e-commerce, woocommerce, automattic, payment, paygate, app inlet, credit card, payment request
 Requires at least: 5.6
-Tested up to: 6.4.1
+Tested up to: 6.5.3
 Requires PHP: 8.0
-Stable tag: 1.4.7
+Stable tag: 1.4.8
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -43,6 +43,10 @@ Need help to configure this plugin? Feel free to connect with our Payfast Suppor
 4. WooCommerce Admin Paygate Additional Settings continued
 
 == Changelog ==
+= 1.4.8 - 2024-05-28 =
+ * Tested on WooCommerce 8.9.1, PHP 8.1 and WordPress 6.5.3.
+ * Fix payment types compatibility.
+
 = 1.4.7 - 2023-11-22 =
  * Tested on WooCommerce 8.3.1, PHP 8.0 and WordPress 6.4.1.
  * Add support for HPOS and Blocks.
@@ -54,16 +58,14 @@ Need help to configure this plugin? Feel free to connect with our Payfast Suppor
  * Fix multi-domain multisite network activation.
  * Fix invalid checksum message if order is already paid.
 
-= 1.4.5 - 2022-01-04 =
- * Tested on WooCommerce 6.0 and WordPress 5.8.
- * Implement payment type filter hooks.
- * Update Masterpass to Scan to Pay.
- * Add transient in notify handler to curb duplicate transactions.
-
 [See changelog for all versions](https://raw.githubusercontent.com/PayGate/PayWeb_WooCommerce/master/changelog.txt).
 
 == Upgrade Notice ==
 
+= 1.4.8 - 2024-05-28 =
+ * Tested on WooCommerce 8.9.1, PHP 8.1 and WordPress 6.5.3.
+ * Fix payment types compatibility.
+
 = 1.4.7 - 2023-11-22 =
  * Tested on WooCommerce 8.3.1, PHP 8.0 and WordPress 6.4.1.
  * Add support for HPOS and Blocks.
@@ -74,9 +76,3 @@ Need help to configure this plugin? Feel free to connect with our Payfast Suppor
  * Tested on WooCommerce 6.7.0, PHP 8.0 and WordPress 6.0.1.
  * Fix multi-domain multisite network activation.
  * Fix invalid checksum message if order is already paid.
-
-= 1.4.5 - 2022-01-04 =
- * Tested on WooCommerce 6.0 and WordPress 5.8.
- * Implement payment type filter hooks.
- * Update Masterpass to Scan to Pay.
- * Add transient in notify handler to curb duplicate transactions.