Skip to content

Commit 2a99031

Browse files
hasinur1997hasinur1997
committed
Merge branch 'release/2.0.4'
2 parents 54eb91f + b3b60a6 commit 2a99031

File tree

7 files changed

+46
-12
lines changed

7 files changed

+46
-12
lines changed

‎assets/js/admin.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,13 @@
111111
} );
112112
} );
113113

114-
})( jQuery );
114+
// Dismiss notice
115+
$('.wcct-notice-wrap').on( 'click', function() {
116+
wp.ajax.send( 'wcct_dismissable_notice', {
117+
success: function( response ) {
118+
console.log( 'Success' );
119+
}
120+
} );
121+
} );
122+
123+
})( jQuery );

‎conversion-tracking.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
Plugin Name: WooCommerce Conversion Tracking
44
Plugin URI: https://wedevs.com/products/plugins/woocommerce-conversion-tracking/
55
Description: Adds various conversion tracking codes to cart, checkout, registration success and product page on WooCommerce
6-
Version: 2.0.3
6+
Version: 2.0.4
77
Author: Tareq Hasan
88
Author URI: https://tareq.co/
99
License: GPL2
1010
WC requires at least: 2.3
11-
WC tested up to: 3.6.2
11+
WC tested up to: 3.7.0
1212
*/
1313

1414
/**
@@ -54,7 +54,7 @@ class WeDevs_WC_Conversion_Tracking {
5454
*
5555
* @var string
5656
*/
57-
public $version = '2.0.3';
57+
public $version = '2.0.4';
5858

5959
/**
6060
* Holds various class instances
@@ -301,11 +301,16 @@ public function happy_addons_ads_banner() {
301301
if ( class_exists( '\Happy_Addons\Elementor\Base' ) ) {
302302
return;
303303
}
304+
$dismissable = get_option( 'wcct_dismissable_notice' );
305+
306+
if ( $dismissable == 'closed' ) {
307+
return;
308+
}
304309

305310
?>
306311
<div id="wcct_remote_notice" class="notice notice-success">
307312
</div>
308-
<div class="notice wcct-notice-wrap">
313+
<div class="notice is-dismissible wcct-notice-wrap">
309314
<div class="wcct-message-icon">
310315
<img src="<?php echo WCCT_ASSETS . '/images/happy-addons.png'?>" alt="">
311316
</div>

‎includes/class-ajax.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class WCCT_Ajax {
1111
public function __construct() {
1212
add_action( 'wp_ajax_wcct_save_settings', array( $this, 'wcct_save_settings' ) );
1313
add_action( 'wp_ajax_activate_happy_addons', array( $this, 'wcct_install_happy_addons' ) );
14+
add_action( 'wp_ajax_wcct_dismissable_notice', array( $this, 'wcct_dismissable_notice' ) );
1415
}
1516

1617
/**
@@ -89,4 +90,18 @@ public function wcct_install_happy_addons() {
8990
]);
9091
}
9192

93+
/**
94+
* Dismissable notice
95+
*
96+
* @return object
97+
*/
98+
public function wcct_dismissable_notice() {
99+
if ( ! current_user_can( 'manage_options' ) ) {
100+
return;
101+
}
102+
103+
update_option( 'wcct_dismissable_notice', 'closed' );
104+
105+
wp_send_json_success();
106+
}
92107
}

‎includes/integrations/class-integration-google.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class WCCT_Integration_Google extends WCCT_Integration {
1010
*/
1111
function __construct() {
1212
$this->id = 'adwords';
13-
$this->name = __( 'Google Adwords', 'woocommerce-conversion-tracking' );
13+
$this->name = __( 'Google Ads', 'woocommerce-conversion-tracking' );
1414
$this->enabled = true;
1515
$this->supports = array(
1616
'checkout',
@@ -30,7 +30,7 @@ public function get_settings() {
3030
'label' => __( 'Account ID', 'woocommerce-conversion-tracking' ),
3131
'value' => '',
3232
'placeholder' => 'AW-123456789',
33-
'help' => sprintf( __( 'Provide the AdWords Account ID. Usually it\'s something like <code>AW-123456789</code>, <a href="%s" target="_blank">learn more</a>.', 'woocommerce-conversion-tracking' ), 'https://wedevs.com/docs/woocommerce-conversion-tracking/google-adwords/account-id/?utm_source=wp-admin&utm_medium=inline-help&utm_campaign=wcct_docs&utm_content=adwords_learn_more' )
33+
'help' => sprintf( __( 'Provide the Google Ads Account ID. Usually it\'s something like <code>AW-123456789</code>, <a href="%s" target="_blank">learn more</a>.', 'woocommerce-conversion-tracking' ), 'https://wedevs.com/docs/woocommerce-conversion-tracking/google-adwords/account-id/?utm_source=wp-admin&utm_medium=inline-help&utm_campaign=wcct_docs&utm_content=adwords_learn_more' )
3434
),
3535
'events' => array(
3636
'type' => 'multicheck',

‎includes/views/settings.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@
146146
<h3 class="wcct-doc-title"><?php _e( 'Documentation', 'woocommerce-conversion-tracking' )?></h3>
147147

148148
<ul class="wcct-doc-list">
149-
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/get-started/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Get_Started" target="_blank"><img src="<?php echo plugins_url( 'assets/images/getting_started.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Getting Started', 'woocommerce-conversion-tracking' ) ?></span></a></li>
149+
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/getting-started/installation/" target="_blank"><img src="<?php echo plugins_url( 'assets/images/getting_started.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Getting Started', 'woocommerce-conversion-tracking' ) ?></span></a></li>
150150
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/facebook/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Facebook" target="_blank"><img src="<?php echo plugins_url( 'assets/images/facebook.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Facebook', 'woocommerce-conversion-tracking' ) ?></span></a></li>
151151
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/twitter/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Twitter" target="_blank"><img src="<?php echo plugins_url( 'assets/images/twitter.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Twitter', 'woocommerce-conversion-tracking' ) ?></span></a></li>
152-
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/google-adwords/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Adwords" target="_blank"><img src="<?php echo plugins_url( 'assets/images/adwords.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Google Adwords', 'woocommerce-conversion-tracking' ) ?></span></a></li>
152+
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/google-adwords/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Adwords" target="_blank"><img src="<?php echo plugins_url( 'assets/images/adwords.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Google Ads', 'woocommerce-conversion-tracking' ) ?></span></a></li>
153153
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/perfect-audience/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Perfect_Audience" target="_blank"><img src="<?php echo plugins_url( 'assets/images/perfect_audience.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Perfect Audience', 'woocommerce-conversion-tracking' ) ?></span></a></li>
154-
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/bing-ads" target="_blank"><img src="<?php echo plugins_url( 'assets/images/bing_ads.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Bing Ads', 'woocommerce-conversion-tracking' ) ?></span></a></li>
154+
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/bing-ads" target="_blank"><img src="<?php echo plugins_url( 'assets/images/bing_ads.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Microsoft Advertising', 'woocommerce-conversion-tracking' ) ?></span></a></li>
155155
<li><a href="https://wedevs.com/docs/woocommerce-conversion-tracking/custom/?utm_source=wp-admin&utm_medium=docs-link&utm_campaign=wcct_docs&utm_content=Custom" target="_blank"><img src="<?php echo plugins_url( 'assets/images/custom.png', WCCT_FILE ); ?>" alt="" class="doc-list-icon"><span><?php _e( 'Custom', 'woocommerce-conversion-tracking' ) ?></span></a></li>
156156
</ul>
157157
</div>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Woocommerce-Conversion-Tracking",
3-
"version": "2.0.3",
3+
"version": "2.0.4",
44
"description": "Conversion tracking plugin for WooCommerce",
55
"author": "Tareq Hasan",
66
"license": "GPL",

‎readme.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: ecommerce, e-commerce, commerce, woocommerce, tracking, facebook, google,
44
Donate link: https://tareq.co/donate/
55
Requires at least: 4.0
66
Tested up to: 5.1.1
7-
Stable tag: 2.0.2
7+
Stable tag: 2.0.4
88
License: GPLv3
99
License URI: http://www.gnu.org/licenses/gpl-3.0.html
1010

@@ -88,6 +88,11 @@ We put the JavaScript scripts provided by you in the page and it fires a convers
8888
5. Custom Codes
8989

9090
== Changelog ==
91+
= Version 2.0.4 (21-August-2019) =
92+
* [fix] Happyaddons dismissable banner
93+
* [fix] Getting started link doesn't work
94+
* [tweak] Change from Google Adwords to Google Ads
95+
9196
= Version 2.0.3 (05-August-2019) =
9297
* [fix] AddToCart Event doesn't work for ajax
9398
* [new] Add happy addons banner

0 commit comments

Comments
 (0)