v3.0.0

Author: algoritmika

composer.json

@@ -0,0 +1,19 @@
+{
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/wpcodefactory/wpfactory-cross-selling"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/wpcodefactory/wpfactory-admin-menu"
+    }
+  ],
+  "require": {
+    "wpfactory/wpfactory-cross-selling": "*",
+    "wpfactory/wpfactory-admin-menu": "*"
+  },
+  "config": {
+    "preferred-install": "dist"
+  }
+}

composer.lock

@@ -2,7 +2,7 @@
 /**
  * Product Notes for WooCommerce - Main Class
  *
- * @version 2.9.5
+ * @version 3.0.0
  * @since   1.0.0
  *
  * @author  Algoritmika Ltd
@@ -57,7 +57,7 @@ public static function instance() {
 	/**
 	 * Alg_WC_Product_Notes Constructor.
 	 *
-	 * @version 2.9.2
+	 * @version 3.0.0
 	 * @since   1.0.0
 	 *
 	 * @access  public
@@ -69,6 +69,11 @@ function __construct() {
 			return;
 		}
 
+		// Load libs
+		if ( is_admin() ) {
+			require_once plugin_dir_path( ALG_WC_PRODUCT_NOTES_FILE ) . 'vendor/autoload.php';
+		}
+
 		// Set up localisation
 		add_action( 'init', array( $this, 'localize' ) );
 
@@ -77,7 +82,7 @@ function __construct() {
 
 		// Pro
 		if ( 'internal-product-notes-for-woocommerce-pro.php' === basename( ALG_WC_PRODUCT_NOTES_FILE ) ) {
-			require_once( 'pro/class-alg-wc-pn-pro.php' );
+			require_once plugin_dir_path( __FILE__ ) . 'pro/class-alg-wc-pn-pro.php';
 		}
 
 		// Include required files
@@ -97,7 +102,11 @@ function __construct() {
 	 * @since   2.3.0
 	 */
 	function localize() {
-		load_plugin_textdomain( 'product-notes-for-woocommerce', false, dirname( plugin_basename( ALG_WC_PRODUCT_NOTES_FILE ) ) . '/langs/' );
+		load_plugin_textdomain(
+			'product-notes-for-woocommerce',
+			false,
+			dirname( plugin_basename( ALG_WC_PRODUCT_NOTES_FILE ) ) . '/langs/'
+		);
 	}
 
 	/**
@@ -110,7 +119,10 @@ function localize() {
 	 */
 	function wc_declare_compatibility() {
 		if ( class_exists( '\Automattic\WooCommerce\Utilities\FeaturesUtil' ) ) {
-			$files = ( defined( 'ALG_WC_PRODUCT_NOTES_FILE_FREE' ) ? array( ALG_WC_PRODUCT_NOTES_FILE, ALG_WC_PRODUCT_NOTES_FILE_FREE ) : array( ALG_WC_PRODUCT_NOTES_FILE ) );
+			$files = ( defined( 'ALG_WC_PRODUCT_NOTES_FILE_FREE' ) ?
+				array( ALG_WC_PRODUCT_NOTES_FILE, ALG_WC_PRODUCT_NOTES_FILE_FREE ) :
+				array( ALG_WC_PRODUCT_NOTES_FILE )
+			);
 			foreach ( $files as $file ) {
 				\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', $file, true );
 			}
@@ -120,57 +132,114 @@ function wc_declare_compatibility() {
 	/**
 	 * includes.
 	 *
-	 * @version 2.4.0
+	 * @version 3.0.0
 	 * @since   1.0.0
 	 */
 	function includes() {
-		$this->core = require_once( 'class-alg-wc-pn-core.php' );
+		$this->core = require_once plugin_dir_path( __FILE__ ) . 'class-alg-wc-pn-core.php';
 	}
 
 	/**
 	 * admin.
 	 *
-	 * @version 2.4.0
+	 * @version 3.0.0
 	 * @since   1.0.0
 	 */
 	function admin() {
+
 		// Action links
 		add_filter( 'plugin_action_links_' . plugin_basename( ALG_WC_PRODUCT_NOTES_FILE ), array( $this, 'action_links' ) );
+
+		// "Recommendations" page
+		$this->add_cross_selling_library();
+
+		// WC Settings tab as WPFactory submenu item
+		$this->move_wc_settings_tab_to_wpfactory_menu();
+
 		// Settings
 		add_filter( 'woocommerce_get_settings_pages', array( $this, 'add_woocommerce_settings_tab' ) );
+
 		// Version updated
 		if ( get_option( 'alg_wc_product_notes_version', '' ) !== $this->version ) {
 			add_action( 'admin_init', array( $this, 'version_updated' ) );
 		}
+
 	}
 
 	/**
 	 * action_links.
 	 *
-	 * @version 2.4.0
+	 * @version 3.0.0
 	 * @since   1.0.0
 	 *
 	 * @param   mixed $links
 	 * @return  array
 	 */
 	function action_links( $links ) {
 		$custom_links = array();
-		$custom_links[] = '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=alg_wc_product_notes' ) . '">' . __( 'Settings', 'woocommerce' ) . '</a>';
+		$custom_links[] = '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=alg_wc_product_notes' ) . '">' .
+			__( 'Settings', 'product-notes-for-woocommerce' ) .
+		'</a>';
 		if ( 'internal-product-notes-for-woocommerce.php' === basename( ALG_WC_PRODUCT_NOTES_FILE ) ) {
 			$custom_links[] = '<a target="_blank" style="font-weight: bold; color: green;" href="https://wpfactory.com/item/product-notes-for-woocommerce/">' .
-				__( 'Go Pro', 'product-notes-for-woocommerce' ) . '</a>';
+				__( 'Go Pro', 'product-notes-for-woocommerce' ) .
+			'</a>';
 		}
 		return array_merge( $custom_links, $links );
 	}
 
+	/**
+	 * add_cross_selling_library.
+	 *
+	 * @version 3.0.0
+	 * @since   3.0.0
+	 */
+	function add_cross_selling_library() {
+
+		if ( ! class_exists( '\WPFactory\WPFactory_Cross_Selling\WPFactory_Cross_Selling' ) ) {
+			return;
+		}
+
+		$cross_selling = new \WPFactory\WPFactory_Cross_Selling\WPFactory_Cross_Selling();
+		$cross_selling->setup( array( 'plugin_file_path' => ALG_WC_PRODUCT_NOTES_FILE ) );
+		$cross_selling->init();
+
+	}
+
+	/**
+	 * move_wc_settings_tab_to_wpfactory_menu.
+	 *
+	 * @version 3.0.0
+	 * @since   3.0.0
+	 */
+	function move_wc_settings_tab_to_wpfactory_menu() {
+
+		if ( ! class_exists( '\WPFactory\WPFactory_Admin_Menu\WPFactory_Admin_Menu' ) ) {
+			return;
+		}
+
+		$wpfactory_admin_menu = \WPFactory\WPFactory_Admin_Menu\WPFactory_Admin_Menu::get_instance();
+
+		if ( ! method_exists( $wpfactory_admin_menu, 'move_wc_settings_tab_to_wpfactory_menu' ) ) {
+			return;
+		}
+
+		$wpfactory_admin_menu->move_wc_settings_tab_to_wpfactory_menu( array(
+			'wc_settings_tab_id' => 'alg_wc_product_notes',
+			'menu_title'         => __( 'Product Notes', 'product-notes-for-woocommerce' ),
+			'page_title'         => __( 'Product Notes', 'product-notes-for-woocommerce' ),
+		) );
+
+	}
+
 	/**
 	 * add_woocommerce_settings_tab.
 	 *
-	 * @version 2.4.0
+	 * @version 3.0.0
 	 * @since   1.0.0
 	 */
 	function add_woocommerce_settings_tab( $settings ) {
-		$settings[] = require_once( 'settings/class-alg-wc-pn-settings.php' );
+		$settings[] = require_once plugin_dir_path( __FILE__ ) . 'settings/class-alg-wc-pn-settings.php';
 		return $settings;
 	}
 
@@ -215,7 +284,10 @@ function plugin_path() {
 	 * @since   2.0.0
 	 */
 	function get_id( $private_or_public ) {
-		return ( 'private' === $private_or_public ? 'alg_wc_internal_product_note' : 'alg_wc_public_product_note' );
+		return ( 'private' === $private_or_public ?
+			'alg_wc_internal_product_note' :
+			'alg_wc_public_product_note'
+		);
 	}
 
 }

includes/class-alg-wc-pn.php

@@ -3,12 +3,12 @@
 Plugin Name: Product Notes for WooCommerce
 Plugin URI: https://wpfactory.com/item/product-notes-for-woocommerce/
 Description: Add notes to WooCommerce products.
-Version: 2.9.6
+Version: 3.0.0
 Author: WPFactory
 Author URI: https://wpfactory.com
 Text Domain: product-notes-for-woocommerce
 Domain Path: /langs
-WC tested up to: 9.1
+WC tested up to: 9.3
 Requires Plugins: woocommerce
 */
 
@@ -31,7 +31,7 @@
 	}
 }
 
-defined( 'ALG_WC_PRODUCT_NOTES_VERSION' ) || define( 'ALG_WC_PRODUCT_NOTES_VERSION', '2.9.6' );
+defined( 'ALG_WC_PRODUCT_NOTES_VERSION' ) || define( 'ALG_WC_PRODUCT_NOTES_VERSION', '3.0.0' );
 
 defined( 'ALG_WC_PRODUCT_NOTES_FILE' ) || define( 'ALG_WC_PRODUCT_NOTES_FILE', __FILE__ );