Merge branch 'release/2.0.1'

Author: hasinur1997

composer.json

@@ -10,5 +10,8 @@
         }
     ],
     "minimum-stability": "dev",
-    "require": {}
+    "require": {
+        "php": ">=5.4.0",
+        "composer/installers": "~1.0"
+    }
 }

conversion-tracking.php

@@ -3,12 +3,12 @@
 Plugin Name: WooCommerce Conversion Tracking
 Plugin URI: https://wedevs.com/products/plugins/woocommerce-conversion-tracking/
 Description: Adds various conversion tracking codes to cart, checkout, registration success and product page on WooCommerce
-Version: 2.0
+Version: 2.0.1
 Author: Tareq Hasan
 Author URI: https://tareq.co/
 License: GPL2
 WC requires at least: 2.3
-WC tested up to: 3.2.6
+WC tested up to: 3.5.7
 */
 
 /**
@@ -54,7 +54,7 @@ class WeDevs_WC_Conversion_Tracking {
      *
      * @var string
      */
-    public $version = '2.0';
+    public $version = '2.0.1';
 
     /**
      * Holds various class instances
@@ -76,7 +76,6 @@ public function __construct() {
         $this->init_classes();
 
         register_activation_hook( __FILE__, array( $this, 'activate' ) );
-
         do_action( 'wcct_loaded' );
     }
 
@@ -180,7 +179,7 @@ public function init_hooks() {
         add_action( 'plugins_loaded', array( $this, 'plugin_upgrades' ) );
         add_action( 'init', array( $this, 'localization_setup' ) );
         add_action( 'init', array( $this, 'init_tracker' ) );
-
+        add_action( 'admin_notices', array( $this, 'check_woocommerce_exist' ) );
         add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
     }
 
@@ -273,6 +272,20 @@ function plugin_action_links( $links ) {
 
         return $links;
     }
+    /**
+     * Check Woocommerce exist
+     *
+     * @return void
+     */
+    public function check_woocommerce_exist() {
+        if ( ! function_exists( 'WC' ) ) {
+            ?>
+                <div class="error notice is-dismissible">
+                    <p><?php _e( '<b>Woocommerce conversion tracking</b> requires <a target="_blank" href="https://wordpress.org/plugins/woocommerce/">Woocommerce</a>', 'woocommerce-conversion-tracking' );?></p>
+                </div>
+            <?php
+        }
+    }
 }
 
 function wcct_init() {

includes/class-event-dispatcher.php

@@ -185,10 +185,10 @@ private function dispatch_event( $event, $value = '' ) {
      */
     public function enqueue_scripts() {
 
-        echo '<!------ Starting: WooCommerce Conversion Tracking (https://wordpress.org/plugins/woocommerce-conversion-tracking/) ----->' . PHP_EOL;
+        echo '<!-- Starting: WooCommerce Conversion Tracking (https://wordpress.org/plugins/woocommerce-conversion-tracking/) -->' . PHP_EOL;
         foreach ( $this->integrations as $integration ) {
             $integration->enqueue_script();
         }
-        echo '<!------ End: WooCommerce Conversion Tracking Codes ----->' . PHP_EOL;
+        echo '<!-- End: WooCommerce Conversion Tracking Codes -->' . PHP_EOL;
     }
 }

includes/integrations/class-integration-custom.php

@@ -32,7 +32,7 @@ public function get_settings() {
                 'value' => '',
                 'help'  => sprintf( /* translators: %s: dynamic values */
                                    __( 'Put your JavaScript tracking scripts here. You can use dynamic values: %s', 'woocommerce-conversion-tracking' ),
-                    '<code>{customer_id}</code>, <code>{customer_email}</code>, <code>{customer_first_name}</code>, <code>{customer_last_name}</code>, <code>{order_number}</code>, <code>{order_total}</code>, <code>{order_subtotal}</code>, <code>{currency}</code>, <code>{payment_method}</code>'
+                    '<code>{customer_id}</code>, <code>{customer_email}</code>, <code>{customer_first_name}</code>, <code>{customer_last_name}</code>, <code>{order_number}</code>, <code>{order_total}</code>, <code>{order_subtotal}</code>, <code>{order_discount}</code>, <code>{order_shipping}</code>, <code>{currency}</code>, <code>{payment_method}</code>'
                 ),
             ),
             array(
@@ -123,6 +123,9 @@ function process_order_markdown( $code, $order_id ) {
         $order_total    = $order->get_total();
         $order_number   = $order->get_order_number();
         $order_subtotal = $order->get_subtotal();
+	$order_discount = $order->get_total_discount();
+	$order_shipping = $order->get_total_shipping();
+
 
         // customer details
         if ( $customer ) {
@@ -139,6 +142,8 @@ function process_order_markdown( $code, $order_id ) {
         $code = str_replace( '{order_total}', $order_total, $code );
         $code = str_replace( '{order_number}', $order_number, $code );
         $code = str_replace( '{order_subtotal}', $order_subtotal, $code );
+	$code = str_replace( '{order_discount}', $order_discount, $code );
+	$code = str_replace( '{order_shipping}', $order_shipping, $code );
 
         return $code;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Woocommerce-Conversion-Tracking",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "description": "Conversion tracking plugin for WooCommerce",
   "author": "Tareq Hasan",
   "license": "GPL",

readme.txt

@@ -3,8 +3,8 @@ Contributors: tareq1988
 Tags: ecommerce, e-commerce, commerce, woocommerce, tracking, facebook, google, adwords, tracking-pixel
 Donate link: https://tareq.co/donate/
 Requires at least: 4.0
-Tested up to: 4.9.4
-Stable tag: 2.0
+Tested up to: 5.1.1
+Stable tag: 2.0.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -16,6 +16,29 @@ When you are integrating any advertising campaigns, they provide various trackin
 
 This plugin inserts those codes on WooCommerce cart page, checkout success page and after user registration. So you can track who are adding your products to cart, who are buying them and who are registering to your site.
 
+= Supported Integrations =
+
+ * [Facebook](https://wedevs.com/docs/woocommerce-conversion-tracking/facebook/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=facebook)
+ * [Twitter](https://wedevs.com/docs/woocommerce-conversion-tracking/twitter/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=twitter)
+ * [Google Adwords](https://wedevs.com/docs/woocommerce-conversion-tracking/google-adwords/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=google_adwords)
+ * [Custom Tracking](https://wedevs.com/docs/woocommerce-conversion-tracking/custom/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=custom)
+
+= Pro Features =
+
+ * More Facebook Events
+ * Multiple Facebook Pixels
+ * [Facebook Product Catalog](https://wedevs.com/docs/woocommerce-conversion-tracking/facebook/facebook-product-catalog/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=product_catalog)
+ * [Perfect Audience](https://wedevs.com/docs/woocommerce-conversion-tracking/perfect-audience/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=perfect_audience)
+ * More Twitter and Google Adwords Events
+
+[**Get Pro Version**](https://wedevs.com/woocommerce-conversion-tracking/pricing/?utm_source=wporg&utm_medium=Readme&utm_campaign=wcct-lite&utm_content=pricing)
+
+= Videos =
+[youtube http://www.youtube.com/watch?v=PZN883xb51c]
+[youtube http://www.youtube.com/watch?v=6QMWzM9decU]
+
+[**All Videos**](https://www.youtube.com/watch?v=b3BHJwQ7Q70&list=PLJorZsV2RVv_7zV2I1_X_xJODZklXHQtS)
+
 = Contribute =
 [Github](https://github.com/tareq1988/woocommerce-conversion-tracking)
 
@@ -58,10 +81,18 @@ We put the JavaScript scripts provided by you in the page and it fires a convers
 == Screenshots ==
 
 1. Settings Panel
-2. Tracking code on single product.
+2. Facebook Pixel Setup
+3. Google Adwords Conversion Tracking Settings
+4. Twitter Purchase Tracking Setup
+5. Custom Codes
 
 == Changelog ==
 
+= Version 2.0.1 (04-April-2019) =
+
+ * [fix] Added plugin require notice
+
+
 = Version 2.0 (22-February-2018) =
 
  * Major version released