Merge branch 'release/2.0.11'

Author: nurul-umbhiya

.gitignore

@@ -5,3 +5,4 @@ build
 phpcs-report.txt
 vendor
 .DS_Store
+.idea/

composer.json

@@ -12,16 +12,23 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=7.0",
-        "composer/installers": "^1.9"
+        "composer/installers": "^1.9",
+        "appsero/client": "dev-develop"
     },
 
     "require-dev": {
-        "automattic/vipwpcs": "dev-master",
+        "automattic/vipwpcs": "^2.3",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7"
     },
    "scripts": {
         "phpcs": [
           "phpcs -p -s"
         ]
-   }
+   },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }

composer.lock

@@ -3,12 +3,12 @@
 Plugin Name: WooCommerce Conversion Tracking
 Plugin URI: https://wedevs.com/woocommerce-conversion-tracking/
 Description: Adds various conversion tracking codes to cart, checkout, registration success and product page on WooCommerce
-Version: 2.0.10
+Version: 2.0.11
 Author: weDevs
 Author URI: https://wedevs.com/?utm_source=ORG_Author_URI_WCCT
 License: GPL2
-WC requires at least: 2.3
-WC tested up to: 5.2
+WC requires at least: 5.0.0
+WC tested up to: 8.1.0
 */
 
 /**
@@ -54,7 +54,7 @@ class WeDevs_WC_Conversion_Tracking {
      *
      * @var string
      */
-    public $version = '2.0.10';
+    public $version = '2.0.11';
 
     /**
      * Holds various class instances
@@ -70,12 +70,17 @@ class WeDevs_WC_Conversion_Tracking {
      * within our plugin.
      */
     public function __construct() {
+	    require_once __DIR__ . '/vendor/autoload.php';
+
         $this->define_constants();
         $this->init_hooks();
         $this->includes();
         $this->init_classes();
 
         register_activation_hook( __FILE__, array( $this, 'activate' ) );
+        // hpos support
+	    add_action( 'before_woocommerce_init', [ $this, 'add_hpos_support' ] );
+
         do_action( 'wcct_loaded' );
     }
 
@@ -241,10 +246,6 @@ public function plugin_upgrades() {
      * @return void
      */
     public function init_tracker() {
-        if ( ! class_exists( 'Appsero\Client' ) ) {
-            require_once __DIR__ . '/lib/appsero/Client.php';
-        }
-
         $client = new Appsero\Client(
             '6816029d-7d48-4ed3-8ae4-aeb6a9496f21',
             'WooCommerce Conversion Tracking',
@@ -255,6 +256,19 @@ public function init_tracker() {
         $client->insights()->init();
     }
 
+	/**
+	 * Add High Performance Order Storage Support
+	 *
+	 * @since 2.0.11
+	 *
+	 * @return void
+	 */
+	public function add_hpos_support() {
+		if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
+			\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+		}
+	}
+
     /**
      * Check the pro version
      *

conversion-tracking.php

@@ -199,7 +199,7 @@ public function checkout( $order_id ) {
             return;
         }
 
-        $order        = new WC_Order( $order_id );
+        $order        = wc_get_order( $order_id );
         $content_type = 'product';
         $product_ids  = array();
 

includes/integrations/class-integration-facebook.php

@@ -110,7 +110,7 @@ public function checkout( $order_id ) {
             return;
         }
 
-        $order = new WC_Order( $order_id );
+        $order = wc_get_order( $order_id );
 
         $code = $this->build_event( 'conversion', array(
             'send_to'        => sprintf( "%s/%s", $account_id, $label ),

includes/integrations/class-integration-google.php

@@ -97,7 +97,7 @@ public function checkout( $order_id ) {
             return;
         }
 
-        $order        = new WC_Order( $order_id );
+        $order        = wc_get_order( $order_id );
         $content_type = 'product';
         $product_ids  = array();