| @@ -31,9 +31,9 @@ | ||
| 31 | 31 | exit; // Exit if accessed directly |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // Report version externally |
| 35 | -define('WOO_VIPPS_VERSION', '5.4.3'); | |
| 35 | +define('WOO_VIPPS_VERSION', '6.2.1'); | |
| 36 | 36 | |
| 37 | 37 | define( 'WC_VIPPS_PAYMENT_MAIN_FILE', __FILE__ ); |
| 38 | 38 | |
| 39 | 39 | // Legacy way of starting test mode - please use developer- and test-modes from now on. IOK 2019-08-30 |
| @@ -50,9 +50,9 @@ | ||
| 50 | 50 | /* The QR Code functionality is in its own class for modularity reasons. It is a singleton too. */ |
| 51 | 51 | require_once(dirname(__FILE__) . '/VippsQRCodeController.class.php'); |
| 52 | 52 | VippsQRCodeController::register_hooks(); |
| 53 | 53 | |
| 54 | -/* If Vipps Checkout is activated, load its support. It can still be turned on and off. */ | |
| 54 | +/* If Checkout is activated, load its support. It can still be turned on and off. */ | |
| 55 | 55 | if (get_option('woo_vipps_checkout_activated', false)) { |
| 56 | 56 | require_once(dirname(__FILE__) . '/VippsCheckout.class.php'); |
| 57 | 57 | VippsCheckout::register_hooks(); |
| 58 | 58 | } |
| @@ -62,26 +62,9 @@ | ||
| 62 | 62 | |
| 63 | 63 | // Helper code for specific plugins, themes etc |
| 64 | 64 | require_once(dirname(__FILE__) . '/woo-vipps-compatibility.php'); |
| 65 | 65 | |
| 66 | -// Load code for the new WooCommerce product editor | |
| 67 | -add_action('woocommerce_init', function() { | |
| 68 | - // Only load if we're on a version of WooCommerce that supports all the blocks and features we're using. | |
| 69 | - $is_version_supported = version_compare(wc()->version, '8.6.0', '>='); | |
| 70 | - // Only load if the feature flag is enabled. | |
| 71 | - $is_product_editor_v2_enabled = get_option('woocommerce_feature_product_block_editor_enabled'); | |
| 72 | - if($is_version_supported && $is_product_editor_v2_enabled) { | |
| 73 | - // Load the new blocks | |
| 74 | - require_once(dirname(__FILE__) . '/admin/blocks/register-woo-blocks.php'); | |
| 75 | 66 | |
| 76 | - // Load the V2 product editor | |
| 77 | - require_once(dirname(__FILE__) . '/VippsWCProductEditorV2.class.php'); | |
| 78 | - VippsWCProductEditorV2::register_hooks(); | |
| 79 | - | |
| 80 | - } | |
| 81 | -}); | |
| 82 | - | |
| 83 | - | |
| 84 | 67 | add_action ('before_woocommerce_init', function () { |
| 85 | 68 | $url = sanitize_text_field($_SERVER['REQUEST_URI']); |
| 86 | 69 | # This removes cookies for the wc-api callback events for the vipps plugin, to be 100% sure no sessions are restored when they ought not be IOK 2020-07-01 |
| 87 | 70 | # Re-added and modified IOK 2022-06-20 |
| @@ -94,9 +77,9 @@ | ||
| 94 | 77 | foreach($_COOKIE as $key=>$value) unset($_COOKIE[$key]); |
| 95 | 78 | } |
| 96 | 79 | },1); |
| 97 | 80 | |
| 98 | -// Load the extra Vipps Checkout Shipping classes only when necessary | |
| 81 | +// Load the extra Checkout Shipping classes only when necessary | |
| 99 | 82 | add_action( 'woocommerce_shipping_init', function () { |
| 100 | 83 | if (!class_exists('VippsCheckout_Shipping_Method') && get_option('woo_vipps_checkout_activated', false)) { |
| 101 | 84 | require_once(dirname(__FILE__) . '/VippsCheckoutShippingMethods.php'); |
| 102 | 85 | } |
