Merge branch 'release/2.0.7'

Author: tareq1988

composer.json

@@ -24,4 +24,4 @@
           "phpcs -p -s"
         ]
    }
-}
+}

conversion-tracking.php

@@ -1,18 +1,18 @@
 <?php
 /*
 Plugin Name: WooCommerce Conversion Tracking
-Plugin URI: https://wedevs.com/products/plugins/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.6
-Author: Tareq Hasan
-Author URI: https://tareq.co/
+Version: 2.0.7
+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: 3.8.1
+WC tested up to: 4.0.1
 */
 
 /**
- * Copyright (c) 2017 Tareq Hasan (email: tareq@wedevs.com). All rights reserved.
+ * Copyright (c) 2020 Tareq Hasan (email: tareq@wedevs.com). All rights reserved.
  *
  * Released under the GPL license
  * http://www.opensource.org/licenses/gpl-license.php
@@ -293,7 +293,7 @@ public function check_woocommerce_exist() {
         if ( ! function_exists( 'WC' ) ) {
             ?>
                 <div class="error notice is-dismissible">
-                    <p><?php echo wp_kses_post( __( '<b>Woocommerce conversion tracking</b> requires <a target="_blank" href="https://wordpress.org/plugins/woocommerce/">Woocommerce</a>', 'woocommerce-conversion-tracking' ) );?></p>
+                    <p><?php echo __( '<b>Woocommerce conversion tracking</b> requires <a target="_blank" href="https://wordpress.org/plugins/woocommerce/">Woocommerce</a>', 'woocommerce-conversion-tracking' ); ?></p>
                 </div>
             <?php
         }
@@ -326,7 +326,7 @@ public function happy_addons_ads_banner() {
                     <img src="<?php echo esc_attr( WCCT_ASSETS . '/images/happy-addons.png' )?>" alt="">
                 </div>
                 <div class="wcct-message-content">
-                    <p><?php echo wp_kses_post( __( 'Reach beyond your imagination in creating web pages. <strong> Try Happy Addons for Elementor to shape your dream.</strong> 😊') ) ?></p>
+                    <p><?php echo __( 'Reach beyond your imagination in creating web pages. <strong> Try Happy Addons for Elementor to shape your dream.</strong> 😊' ); ?></p>
                 </div>
                 <div class="wcct-message-action">
                     <a href="" id="wcct-install-happ-addons" class="button button-primary"> <i class="dashicons dashicons-update wcct-update-icon"></i> Install Now For FREE</a>

includes/class-admin.php

@@ -104,6 +104,6 @@ public function show_navigation() {
 
         $html   .= '</h2>';
 
-        echo wp_kses_post( $html );
+        echo $html;
     }
 }

includes/class-ajax.php

@@ -11,7 +11,6 @@ class WCCT_Ajax {
     public function __construct() {
         add_action( 'wp_ajax_wcct_save_settings', array( $this, 'wcct_save_settings' ) );
         add_action( 'wp_ajax_activate_happy_addons', array( $this, 'wcct_install_happy_addons' ) );
-        add_action( 'wp_ajax_wcct_dismissable_notice', array( $this, 'wcct_dismissable_notice' ) );
     }
 
     /**
@@ -99,19 +98,4 @@ public function wcct_install_happy_addons() {
             'message' => __( 'Successfully installed and activate,', 'woocommerce-conversion-tracking' )
         ]);
     }
-
-    /**
-     * Dismissable notice
-     *
-     * @return object
-     */
-    public function wcct_dismissable_notice() {
-        if ( ! current_user_can( 'manage_options' ) ) {
-            return;
-        }
-
-        update_option( 'wcct_dismissable_notice', 'closed' );
-
-        wp_send_json_success();
-    }
 }

includes/class-event-dispatcher.php

@@ -36,9 +36,7 @@ function __construct() {
         add_action( 'pre_get_posts', array( $this, 'product_search' ) );
 
         // Wishlist Event
-
         add_filter( 'yith_wcwl_added_to_wishlist', array( $this, 'product_wishlist' ) );
-
         add_action( 'woocommerce_wishlist_add_item', array( $this, 'product_wishlist' ) );
     }