Ecwid Ecommerce Shopping Cart - Version 6.9.5

Version Description

  • Apr 21, 2020 =

  • Minor changes in the plugin code to comply with the WordPress plugin marketplace recommendations.

See full changelog

Download this release

Release Info

Developer Ecwid
Plugin Icon 128x128 Ecwid Ecommerce Shopping Cart
Version 6.9.5
Comparing to
See all releases

Code changes from version 6.9.4 to 6.9.5

Files changed (8) hide show
  1. ecwid-shopping-cart.php +11 -16
  2. includes/class-ecwid-admin-main-page.php +0 -1
  3. js/welcome-page.js +6 -2
  4. readme.txt +2 -3
  5. templates/admin/welcome-connect.php +6 -1
  6. templates/admin/welcome-create.php +5 -5
  7. templates/admin/welcome-no_oauth.php +6 -1
  8. templates/admin/welcome-terms-privacy.php +11 -0
ecwid-shopping-cart.php CHANGED
@@ -5,7 +5,7 @@ Plugin URI: http://www.ecwid.com?partner=wporg
5
  Description: Ecwid is a free full-featured shopping cart. It can be easily integrated with any Wordpress blog and takes less than 5 minutes to set up.
6
  Text Domain: ecwid-shopping-cart
7
  Author: Ecwid Ecommerce
8
- Version: 6.9.4
9
  Author URI: https://ecwid.to/ecwid-site
10
  License: GPLv2 or later
11
  */
@@ -351,20 +351,6 @@ function ecwid_redirect_canonical2($redir, $req) {
351
  return $redir;
352
  }
353
 
354
- add_action( 'current_screen', 'ecwid_add_deactivation_popup' );
355
-
356
- function ecwid_add_deactivation_popup()
357
- {
358
- if ( get_current_screen()->id == 'plugins' ) {
359
- require_once ECWID_PLUGIN_DIR . 'includes/class-ecwid-popup-deactivate.php';
360
-
361
- $popup = new Ecwid_Popup_Deactivate();
362
-
363
- if ( !$popup->is_disabled() ) {
364
- Ecwid_Popup::add_popup( $popup );
365
- }
366
- }
367
- }
368
 
369
  function ecwid_enqueue_frontend() {
370
  global $ecwid_current_theme;
@@ -1682,9 +1668,15 @@ EOT;
1682
 
1683
  add_action( 'activated_plugin', 'ecwid_plugin_activation_redirect' );
1684
  function ecwid_plugin_activation_redirect( $plugin ) {
 
 
 
 
 
 
1685
  $is_newbie = ecwid_is_demo_store();
1686
 
1687
- if( $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
1688
  exit( wp_safe_redirect( Ecwid_Admin::get_dashboard_url() ) );
1689
  }
1690
  }
@@ -2140,6 +2132,7 @@ function ecwid_get_register_link()
2140
  . Ecwid_Config::get_channel_id()
2141
  . '%s#register';
2142
 
 
2143
  $current_user = wp_get_current_user();
2144
 
2145
  $user_data = '';
@@ -2159,6 +2152,7 @@ function ecwid_get_register_link()
2159
  }
2160
  $user_data = '&' . build_query($data);
2161
  }
 
2162
 
2163
  $link = sprintf($link, $user_data);
2164
 
@@ -2219,6 +2213,7 @@ function ecwid_create_store() {
2219
  } else {
2220
 
2221
  header( 'HTTP/1.1 ' . $result['response']['code'] . ' ' . $result['response']['message'] );
 
2222
  }
2223
  }
2224
 
5
  Description: Ecwid is a free full-featured shopping cart. It can be easily integrated with any Wordpress blog and takes less than 5 minutes to set up.
6
  Text Domain: ecwid-shopping-cart
7
  Author: Ecwid Ecommerce
8
+ Version: 6.9.5
9
  Author URI: https://ecwid.to/ecwid-site
10
  License: GPLv2 or later
11
  */
351
  return $redir;
352
  }
353
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
354
 
355
  function ecwid_enqueue_frontend() {
356
  global $ecwid_current_theme;
1668
 
1669
  add_action( 'activated_plugin', 'ecwid_plugin_activation_redirect' );
1670
  function ecwid_plugin_activation_redirect( $plugin ) {
1671
+
1672
+ $is_bulk_activation = isset($_POST['action'])
1673
+ && $_POST['action'] == 'activate-selected'
1674
+ && isset($_POST['checked'])
1675
+ && count($_POST['checked']) > 1;
1676
+
1677
  $is_newbie = ecwid_is_demo_store();
1678
 
1679
+ if( !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
1680
  exit( wp_safe_redirect( Ecwid_Admin::get_dashboard_url() ) );
1681
  }
1682
  }
2132
  . Ecwid_Config::get_channel_id()
2133
  . '%s#register';
2134
 
2135
+ /*
2136
  $current_user = wp_get_current_user();
2137
 
2138
  $user_data = '';
2152
  }
2153
  $user_data = '&' . build_query($data);
2154
  }
2155
+ */
2156
 
2157
  $link = sprintf($link, $user_data);
2158
 
2213
  } else {
2214
 
2215
  header( 'HTTP/1.1 ' . $result['response']['code'] . ' ' . $result['response']['message'] );
2216
+ die();
2217
  }
2218
  }
2219
 
includes/class-ecwid-admin-main-page.php CHANGED
@@ -24,7 +24,6 @@ class Ecwid_Admin_Main_Page
24
  if (
25
  $this->_is_whitelabel_mode_with_no_registration()
26
  || $this->_is_oauth_error()
27
- || $this->_is_current_user_email_registered_at_ecwid()
28
  || self::is_forced_reconnect()
29
  ) {
30
 
24
  if (
25
  $this->_is_whitelabel_mode_with_no_registration()
26
  || $this->_is_oauth_error()
 
27
  || self::is_forced_reconnect()
28
  ) {
29
 
js/welcome-page.js CHANGED
@@ -20,8 +20,12 @@ jQuery(document).ready(function(){
20
  location.href="admin.php?page=ec-store";
21
  }, 1000);
22
  },
23
- error: function() {
24
- window.location.href = ecwidParams.registerLink;
 
 
 
 
25
  }
26
  }
27
  );
20
  location.href="admin.php?page=ec-store";
21
  }, 1000);
22
  },
23
+ error: function(error) {
24
+ if( error.status == '409' ) {
25
+ location.href = 'admin-post.php?action=ec_connect';
26
+ } else {
27
+ location.href = ecwidParams.registerLink;
28
+ }
29
  }
30
  }
31
  );
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: Ecwid
3
  Tags: ecommerce, e-commerce, storefront, online store, sell
4
  Requires at least: 3.7
5
  Tested up to: 5.4
6
- Stable tag: 6.9.4
7
 
8
  Powerful, easy to use ecommerce shopping cart. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available.
9
 
@@ -154,9 +154,8 @@ You can use Ecwid’s built-in import tools to copy your store products from any
154
 
155
  == Changelog ==
156
 
157
- = 6.9.4 - Apr 15, 2020 =
158
 
159
- - Improvements for the integration with the All in SEO plugin. There was a minor SEO issue with duplicates of the canonical tag on ecommerce store pages. The issue has been fixed and everything should work fine now.
160
  - Minor changes in the plugin code to comply with the WordPress plugin marketplace recommendations.
161
 
162
  [See full changelog](https://raw.githubusercontent.com/Ecwid/ecwid-wordpress-plugin/master/CHANGELOG.txt)
3
  Tags: ecommerce, e-commerce, storefront, online store, sell
4
  Requires at least: 3.7
5
  Tested up to: 5.4
6
+ Stable tag: 6.9.5
7
 
8
  Powerful, easy to use ecommerce shopping cart. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available.
9
 
154
 
155
  == Changelog ==
156
 
157
+ = 6.9.5 - Apr 21, 2020 =
158
 
 
159
  - Minor changes in the plugin code to comply with the WordPress plugin marketplace recommendations.
160
 
161
  [See full changelog](https://raw.githubusercontent.com/Ecwid/ecwid-wordpress-plugin/master/CHANGELOG.txt)
templates/admin/welcome-connect.php CHANGED
@@ -42,4 +42,9 @@ if( $ecwid_oauth->get_reconnect_message() ) {
42
  echo $this->get_welcome_page_note( $ecwid_oauth->get_reconnect_message() );
43
  }
44
 
45
- ?>
 
 
 
 
 
42
  echo $this->get_welcome_page_note( $ecwid_oauth->get_reconnect_message() );
43
  }
44
 
45
+ ?>
46
+
47
+
48
+ <?php
49
+ require_once ECWID_ADMIN_TEMPLATES_DIR . '/welcome-terms-privacy.php';
50
+ ?>
templates/admin/welcome-create.php CHANGED
@@ -7,10 +7,10 @@
7
  <a href="<?php echo $connect_url; ?>" class="ec-connect-store"><?php _e( 'Connect your store', 'ecwid-shopping-cart' ); ?>&nbsp;&rsaquo;</a>
8
  </div>
9
 
10
- <div class="ec-note ec-create-store-note">
11
- &nbsp;
12
- </div>
13
-
14
  <div class="ec-note ec-create-store-success-note">
15
  <?php _e('Your store has been created. Preparing your store dashboard ...', 'ecwid-shopping-cart'); ?>
16
- </div>
 
 
 
 
7
  <a href="<?php echo $connect_url; ?>" class="ec-connect-store"><?php _e( 'Connect your store', 'ecwid-shopping-cart' ); ?>&nbsp;&rsaquo;</a>
8
  </div>
9
 
 
 
 
 
10
  <div class="ec-note ec-create-store-success-note">
11
  <?php _e('Your store has been created. Preparing your store dashboard ...', 'ecwid-shopping-cart'); ?>
12
+ </div>
13
+
14
+ <?php
15
+ require_once ECWID_ADMIN_TEMPLATES_DIR . '/welcome-terms-privacy.php';
16
+ ?>
templates/admin/welcome-no_oauth.php CHANGED
@@ -6,10 +6,15 @@
6
  <button id="ecwid-connect-no-oauth" data-href="admin-post.php?action=ec_connect" class="btn btn--orange btn--medium btn--no-animate form-block__btn form-block__element" type="button"><?php _e( 'Connect', 'ecwid-shopping-cart' ); ?></button>
7
  </div>
8
  </div>
 
9
  <div class="ec-note">
10
  <?php echo sprintf(
11
  __( 'Store ID is a unique identifier of your %1$s account. You can find it in your %1$s control panel on the <a %2$s>Dashboard page</a>.', 'ecwid-shopping-cart' ),
12
  Ecwid_Config::get_brand(),
13
  'href="https://' . Ecwid_Config::get_cpanel_domain() . '/cp/CP.html?partner=wporg#dashboard" target="_blank"'
14
  ); ?>
15
- </div>
 
 
 
 
6
  <button id="ecwid-connect-no-oauth" data-href="admin-post.php?action=ec_connect" class="btn btn--orange btn--medium btn--no-animate form-block__btn form-block__element" type="button"><?php _e( 'Connect', 'ecwid-shopping-cart' ); ?></button>
7
  </div>
8
  </div>
9
+
10
  <div class="ec-note">
11
  <?php echo sprintf(
12
  __( 'Store ID is a unique identifier of your %1$s account. You can find it in your %1$s control panel on the <a %2$s>Dashboard page</a>.', 'ecwid-shopping-cart' ),
13
  Ecwid_Config::get_brand(),
14
  'href="https://' . Ecwid_Config::get_cpanel_domain() . '/cp/CP.html?partner=wporg#dashboard" target="_blank"'
15
  ); ?>
16
+ </div>
17
+
18
+ <?php
19
+ require_once ECWID_ADMIN_TEMPLATES_DIR . '/welcome-terms-privacy.php';
20
+ ?>
templates/admin/welcome-terms-privacy.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php if( !Ecwid_Config::is_wl() ) { ?>
2
+ <div class="ec-note" style="padding-top: 16px;">
3
+ <?php
4
+ echo sprintf(
5
+ __( 'By continuing, you agree to the <a %s>Terms of Service</a> and <a %s>Privacy Policy</a>.', 'ecwid-shopping-cart' ),
6
+ 'href="http://www.ecwid.com/terms-of-service" target="_blank"',
7
+ 'href="https://www.ecwid.com/privacy-policy" target="_blank"'
8
+ );
9
+ ?>
10
+ </div>
11
+ <?php } ?>