← All changes | merchant.php +12 -16 1.10.2 → 2.3.2 View file →

		@@ -1,10 +1,10 @@
1	1	<?php
2	2	/**
3	3	* Plugin Name: Merchant
4	4	* Plugin URI: https://athemes.com/merchant
5		- * Description: All-in-one plugin designed to help you grow your WooCommerce store. Pre-orders, Buy Now buttons, product labels, trust badges, payment logos, and more.
6		- * Version: 1.10.2
	5	+ * Description: All-in-one WooCommerce plugin for pre-orders, product labels, buy now, quick view, discount rules and more.
	6	+ * Version: 2.3.2
7	7	* Author: aThemes
8	8	* Author URI: https://athemes.com
9	9	* License: GPLv3 or later License
10	10	* License URI: http://www.gnu.org/licenses/gpl-3.0.html
		@@ -9,11 +9,12 @@
9	9	* License: GPLv3 or later License
10	10	* License URI: http://www.gnu.org/licenses/gpl-3.0.html
11	11	* Text Domain: merchant
12	12	* Domain Path: /languages
	13	+ * Requires PHP: 7.4
13	14	*
14	15	* WC requires at least: 6.0
15		- * WC tested up to: 9.3.3
	16	+ * WC tested up to: 11.0.0
16	17	*
17	18	* @package Merchant
18	19	* @since 1.0
19	20	*/
		@@ -23,9 +24,10 @@
23	24	exit;
24	25	}
25	26
26	27	// Merchant constants.
27		-define( 'MERCHANT_VERSION', '1.10.2' );
	28	+define( 'MERCHANT_VERSION', '2.3.2' );
	29	+define( 'MERCHANT_DB_VERSION', '1.2.0' ); // Update only when the database structure changes. In inc/classes/class-merchant-db-tables.php
28	30	define( 'MERCHANT_FILE', __FILE__ );
29	31	define( 'MERCHANT_BASE', trailingslashit( plugin_basename( MERCHANT_FILE ) ) );
30	32	define( 'MERCHANT_DIR', trailingslashit( plugin_dir_path( MERCHANT_FILE ) ) );
31	33	define( 'MERCHANT_URI', trailingslashit( plugins_url( '/', MERCHANT_FILE ) ) );
		@@ -59,17 +61,8 @@
59	61	*
60	62	*/
61	63	public function __construct() {
62	64
63		- // aThemes White Label Compatibility.
64		- if ( function_exists( 'athemes_wl_get_data' ) ) {
65		- $merchant_awl_data = athemes_wl_get_data();
66		-
67		- if ( ! empty( $merchant_awl_data[ 'activate_white_label' ] ) ) {
68		- define( 'MERCHANT_AWL_ACTIVE', true );
69		- }
70		- }
71		-
72	65	// Translation.
73	66	add_action( 'init', array( $this, 'translation' ) );
74	67
75	68	// Declare WooCommerce HPOS Compatibility.
		@@ -78,17 +71,20 @@
78	71	\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
79	72	}
80	73	} );
81	74
82		- // Declare incompatibility with Woo 8.3.0+ cart and checkout blocks.
	75	+ // Declare compatibility with Woo cart and checkout blocks.
83	76	add_action( 'before_woocommerce_init', function() {
84	77	if ( class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) ) {
85		- \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, false );
	78	+ \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, true );
86	79	}
87	80	} );
88	81
89	82	// Load the plugin functionality.
90	83	$this->includes();
	84	+
	85	+ // Initialize the merchant database tables.
	86	+ Merchant_DB_Tables::init();
91	87	}
92	88
93	89	/**
94	90	* Translation
		@@ -110,5 +106,5 @@
110	106
111	107	/**
112	108	* Run the plugin.
113	109	*/
114		-Merchant::instance();
	110	+Merchant::instance();