Fix checkout page handling

VippsCheckout.class.php

@@ -829,7 +829,7 @@ public function maybe_override_checkout_page_id ($id) {
         if (!$vipps_checkout_activated) return $id;
 
          // The gutenberg block  (and other pages) calls the checkout-page-id function *a lot* so let's just check once
-        if ($this->payid) return $id;
+        if ($this->payid) return $this->payid;
 
         // If we are on a checkout page, don't go other places please
         if (is_page()){
@@ -855,7 +855,7 @@ public function maybe_override_checkout_page_id ($id) {
         // Else, if Vipps Checkout is enabled, can be used etc, use that.
         $checkoutid = $this->gateway()->vipps_checkout_available();
         if ($checkoutid) {
-            $this->payid = $id;
+            $this->payid = $checkoutid;
             return $checkoutid;
         }
 

readme.txt

@@ -2,8 +2,8 @@
 Contributors: wphostingdev, iverok, perwilhelmsen, nikolaidev, lassepladsen
 Tags: woocommerce, vipps, mobilepay
 Tags: woocommerce, vipps
-Version: 3.0.5
-Stable tag: 3.0.5
+Version: 3.0.6
+Stable tag: 3.0.6
 Requires at least: 6.2
 Tested up to: 6.7.0
 Requires PHP: 7.0
@@ -94,6 +94,7 @@ Shareable links and QR codes can be generated from the Vipps tab on the product
 This project is hosted on Github at: https://github.com/vippsas/vipps-woocommerce
 
 == Upgrade Notice ==
+Version 3.0.6 Fixes the problem caused by the 3.0.5 fix that disabled Vipps Checkout
 Version 3.0.5 Fixes compatibility issues with Checkout, Checkout for Recurring, WooCommerce Subscriptions and Gutenberg Checkout block
 In version 3.0.0  we are introducing an all-new settings screen reached from the Vipps Mobilpay menu. The old settings page will redirect to this. It should look and feel familiar, but we're going to use this page to hopefully improve the co nfiguraton experience as the features improve and the settings grow more complicated.
 
@@ -240,6 +241,9 @@ From version 1.1.13 you can also modify the javascript using the new WP hooks li
  * 'vippsStatusCheckErrorHandler' - A filter that should return function taking a statustext and an error object. It receives the default error handler, and is called when checking the order status with ajax for some reason ends up in an error.
 
 == Changelog ==
+= 2024-11-18 version 3.0.6 =
+Two extremely dumb errors fixed that interacted with 3.0.5 to disable Vipps Checkout. Sorry.
+
 = 2024-11-18 version 3.0.5 =
 Fixes compatibility issues with Checkout, Checkout for Recurring, WooCommerce Subscriptions and Gutenberg Checkout block
 

woo-vipps.php

@@ -7,8 +7,8 @@
    Author URI: https://www.wp-hosting.no/
    Text-domain: woo-vipps
    Domain Path: /languages
-   Version: 3.0.5
-   Stable tag: 3.0.5
+   Version: 3.0.6
+   Stable tag: 3.0.6
    Requires at least: 6.2
    Tested up to: 6.7.0
    Requires PHP: 7.0
@@ -49,7 +49,7 @@
 
 
 // Report version externally
-define('WOO_VIPPS_VERSION', '3.0.5');
+define('WOO_VIPPS_VERSION', '3.0.6');
 
 if ( ! defined( 'ABSPATH' ) ) {
     exit; // Exit if accessed directly