Ecwid Ecommerce Shopping Cart - Version 6.3.2

Version Description

  • Oct 1, 2018 =
  • Fixed a problem with the WordPress admin menu items. In some cases, the WordPress admin navigation froze when an Ecwid store admin page was opened. Now everything should work fine.
Download this release

Release Info

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

Code changes from version 6.3.1 to 6.3.2

Files changed (14) hide show
  1. css/gutenberg-block.css +0 -26
  2. ecwid-shopping-cart.php +9 -11
  3. images/ecwid_logo_symbol_RGB.svg +0 -37
  4. includes/importer/class-ecwid-import-page.php +15 -0
  5. includes/importer/class-ecwid-importer.php +10 -8
  6. js/gutenberg-block.js +0 -117
  7. readme.txt +4 -1
  8. templates/connect.php +0 -52
  9. templates/dashboard.php +0 -65
  10. templates/ecwid-admin.php +3 -12
  11. templates/importer/woo-complete.tpl.php +2 -0
  12. templates/importer/woo-main.tpl.php +15 -11
  13. templates/landing.php +0 -165
  14. templates/reconnect.php +0 -48
css/gutenberg-block.css DELETED
@@ -1,26 +0,0 @@
1
- .editor-block-list__block[data-type="ecwid/store-block"] .editor-block-list__block-edit {
2
- text-align: center;
3
- min-height: 200px;
4
- background: no-repeat 50% 30px #F1F1F1;
5
- outline: 1px solid #E7E7E7;
6
- background-size: 400px;
7
- }
8
-
9
- .ecwid-store-block-icon {
10
- background: url('../images/wordpress_20x20.svg');
11
- background-size: contain;
12
- width: 20px;
13
- height: 20px;
14
- margin-bottom: 3px;
15
- }
16
-
17
- .ecwid-store-block {
18
- position: relative;
19
- }
20
-
21
- .ecwid-store-block-button {
22
- font-family: Open Sans, Trebuchet MS, Helvetica, Verdana, sans-serif;
23
- position: relative;
24
- top:135px;
25
- font-size: 14px;
26
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ecwid-shopping-cart.php CHANGED
@@ -4,8 +4,8 @@ Plugin Name: Ecwid Shopping Cart
4
  Plugin URI: http://www.ecwid.com?source=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 Team
8
- Version: 6.3.1
9
  Author URI: https://ecwid.to/ecwid-site
10
  */
11
 
@@ -454,11 +454,11 @@ function ecwid_load_textdomain() {
454
  }
455
 
456
  function ecwid_404_on_broken_escaped_fragment() {
457
-
458
  if ( !Ecwid_Api_V3::is_available() ) {
459
  return;
460
  }
461
-
462
  $params = array();
463
 
464
  if (isset($_GET['_escaped_fragment_'])) {
@@ -476,14 +476,12 @@ function ecwid_404_on_broken_escaped_fragment() {
476
  $result = Ecwid_Category::get_by_id( $params['id'] );
477
  }
478
 
479
- if (!$is_root_cat && ( empty( $result ) || is_object ( $result ) && !isset($result->id) ) ) {
480
  status_header( 404 );
 
 
481
 
482
- if (isset($_GET['escaped_fragment'])) {
483
- global $wp_query;
484
-
485
- $wp_query->set_404();
486
- }
487
  }
488
  }
489
  }
@@ -2396,7 +2394,7 @@ function ecwid_admin_do_page( $page ) {
2396
  }
2397
 
2398
  $result = $request->do_request();
2399
-
2400
  if ( @$result['code'] == 403 && (
2401
  strpos($result['data'], 'Token too old') !== false
2402
  || strpos($result['data'], 'window.top.location = \'https://my.ecwid.com/api/v3/' . get_ecwid_store_id() . '/sso?') !== false
4
  Plugin URI: http://www.ecwid.com?source=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.3.2
9
  Author URI: https://ecwid.to/ecwid-site
10
  */
11
 
454
  }
455
 
456
  function ecwid_404_on_broken_escaped_fragment() {
457
+
458
  if ( !Ecwid_Api_V3::is_available() ) {
459
  return;
460
  }
461
+
462
  $params = array();
463
 
464
  if (isset($_GET['_escaped_fragment_'])) {
476
  $result = Ecwid_Category::get_by_id( $params['id'] );
477
  }
478
 
479
+ if (!$is_root_cat && ( empty( $result ) || is_object ( $result ) && ( !isset( $result->id ) || !$result->enabled ) ) ) {
480
  status_header( 404 );
481
+
482
+ global $wp_query;
483
 
484
+ $wp_query->set_404();
 
 
 
 
485
  }
486
  }
487
  }
2394
  }
2395
 
2396
  $result = $request->do_request();
2397
+
2398
  if ( @$result['code'] == 403 && (
2399
  strpos($result['data'], 'Token too old') !== false
2400
  || strpos($result['data'], 'window.top.location = \'https://my.ecwid.com/api/v3/' . get_ecwid_store_id() . '/sso?') !== false
images/ecwid_logo_symbol_RGB.svg DELETED
@@ -1,37 +0,0 @@
1
- <?xml version="1.0" encoding="utf-8"?>
2
- <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
3
- width="500px" height="500px" viewBox="0 0 500 500" enable-background="new 0 0 500 500" xml:space="preserve">
4
- <g>
5
- <path fill="#007AC9" d="M488.655,395.221c0,51.613-41.821,93.435-93.435,93.435H104.784c-51.595,0-93.44-41.821-93.44-93.435
6
- V104.792c0-51.595,41.846-93.447,93.44-93.447h290.437c51.613,0,93.435,41.852,93.435,93.447V395.221z"/>
7
- <g>
8
- <path fill="#FFFFFF" d="M385.354,279.303c12.294-37.304,31.492-119.104,38.734-148.208c6.396-25.745,10.59-35.345-0.971-35.151
9
- c-9.681,0.168-34.354,2.532-39.469,22.901c-8.498,34.025-28.816,112.391-36.257,137.288c-8.188,27.375-25.595,33.1-47.521,33.299
10
- c-19.087,0.137-29.589-1.331-29.589-15.864c-6.097-0.125-15.491-0.051-19.809-0.024c-4.306-0.025-13.701-0.101-19.798,0.024
11
- c0,15.292-10.501,15.864-29.602,15.864c-14.185,0-35.724-2.649-43.587-28.655c-5.5-18.13-19.237-65.052-26.267-89.838
12
- c-7.08-24.774-29.247-26.18-39.892-26.217c-11.69-0.05-10.764,1.841-4.007,26.217c6.731,24.388,21.527,78.776,31.873,115.221
13
- c10.372,36.435,45.883,48.315,68.554,48.315c19.473,0,20.17,0,38.287,0c17.396,0,23.505-7.453,24.438-9.817
14
- c0.933,2.364,7.651,9.817,25.034,9.817c18.154,0,17.656,0,37.117,0C344.168,334.475,373.521,315.312,385.354,279.303z"/>
15
- <path fill="#FFFFFF" d="M192.415,184.674c10.017,0,18.13-8.125,18.13-18.117c0-10.029-8.113-18.154-18.13-18.154
16
- c-10.029,0-18.129,8.125-18.129,18.154C174.285,176.549,182.385,184.674,192.415,184.674z"/>
17
- <path fill="#FFFFFF" d="M251.344,184.674c10.004,0,18.154-8.125,18.154-18.117c0-10.029-8.15-18.154-18.154-18.154
18
- c-10.004,0-18.129,8.125-18.129,18.154C233.214,176.549,241.339,184.674,251.344,184.674z"/>
19
- <path fill="#FFFFFF" d="M311.045,184.674c9.992,0,18.143-8.125,18.143-18.117c0-10.029-8.148-18.154-18.143-18.154
20
- c-10.017,0-18.129,8.125-18.129,18.154C292.916,176.549,301.028,184.674,311.045,184.674z"/>
21
- <path fill="#FFFFFF" d="M192.415,250c10.017,0,18.13-8.125,18.13-18.129c0-10.017-8.113-18.143-18.13-18.143
22
- c-10.029,0-18.129,8.125-18.129,18.143C174.285,241.875,182.385,250,192.415,250z"/>
23
- <path fill="#FFFFFF" d="M251.344,250c10.004,0,18.154-8.125,18.154-18.129c0-10.017-8.15-18.143-18.154-18.143
24
- c-10.004,0-18.129,8.125-18.129,18.143C233.214,241.875,241.339,250,251.344,250z"/>
25
- <path fill="#FFFFFF" d="M311.045,250c9.992,0,18.143-8.125,18.143-18.129c0-10.017-8.148-18.143-18.143-18.143
26
- c-10.017,0-18.129,8.125-18.129,18.143C292.916,241.875,301.028,250,311.045,250z"/>
27
- <path fill="#FFFFFF" d="M107.317,344.441c-20.046,0-36.34,16.312-36.34,36.384c0,20.058,16.294,36.321,36.34,36.321
28
- c20.095,0,36.358-16.264,36.358-36.321C143.675,360.756,127.413,344.441,107.317,344.441z M107.317,393.865
29
- c-7.18,0-13.028-5.836-13.028-13.04c0-7.205,5.848-13.04,13.028-13.04c7.204,0,13.046,5.835,13.046,13.04
30
- C120.363,388.029,114.521,393.865,107.317,393.865z"/>
31
- <path fill="#FFFFFF" d="M394.051,344.006c-20.069,0-36.369,16.289-36.369,36.348c0,20.045,16.3,36.383,36.369,36.383
32
- c20.07,0,36.347-16.338,36.347-36.383C430.397,360.295,414.123,344.006,394.051,344.006z M394.051,393.393
33
- c-7.191,0-13.039-5.836-13.039-13.04c0-7.205,5.848-13.041,13.039-13.041c7.192,0,13.041,5.836,13.041,13.041
34
- C407.092,387.557,401.244,393.393,394.051,393.393z"/>
35
- </g>
36
- </g>
37
- </svg>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
includes/importer/class-ecwid-import-page.php CHANGED
@@ -169,4 +169,19 @@ class Ecwid_Import_Page
169
 
170
  require_once ECWID_IMPORTER_TEMPLATES_DIR . '/woo-main.tpl.php';
171
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
172
  }
169
 
170
  require_once ECWID_IMPORTER_TEMPLATES_DIR . '/woo-main.tpl.php';
171
  }
172
+
173
+ protected function _get_products_categories_message( $products, $categories ) {
174
+ if ( ecwid_is_paid_account() ) {
175
+ return sprintf(
176
+ __( '%s products and %s categories', 'ecwid-shopping-cart' ),
177
+ $products,
178
+ $categories
179
+ );
180
+ } else {
181
+ return sprintf(
182
+ __( '%s products', 'ecwid-shopping-cart' ),
183
+ $products
184
+ );
185
+ }
186
+ }
187
  }
includes/importer/class-ecwid-importer.php CHANGED
@@ -177,20 +177,22 @@ class Ecwid_Importer
177
  protected function _build_tasks()
178
  {
179
  $tasks = array();
180
- /*
181
  if ( $this->get_setting( self::SETTING_DELETE_DEMO ) && self::count_ecwid_demo_products() ) {
182
  $tasks[] = Ecwid_Importer_Task_Delete_Products::build( self::get_ecwid_demo_products() );
183
  }
184
 
185
- $categories = $this->gather_categories();
186
-
187
- foreach ( @$categories as $category ) {
188
- $tasks[] = Ecwid_Importer_Task_Create_Category::build( $category );
189
- if ( $category['has_image'] ) {
190
- $tasks[] = Ecwid_Importer_Task_Upload_Category_Image::build( $category );
 
 
191
  }
192
  }
193
- */
194
  $products = $this->gather_products();
195
 
196
  foreach ( $products as $product ) {
177
  protected function _build_tasks()
178
  {
179
  $tasks = array();
180
+
181
  if ( $this->get_setting( self::SETTING_DELETE_DEMO ) && self::count_ecwid_demo_products() ) {
182
  $tasks[] = Ecwid_Importer_Task_Delete_Products::build( self::get_ecwid_demo_products() );
183
  }
184
 
185
+ if ( ecwid_is_paid_account() ) {
186
+ $categories = $this->gather_categories();
187
+
188
+ foreach ( @$categories as $category ) {
189
+ $tasks[] = Ecwid_Importer_Task_Create_Category::build( $category );
190
+ if ( $category['has_image'] ) {
191
+ $tasks[] = Ecwid_Importer_Task_Upload_Category_Image::build( $category );
192
+ }
193
  }
194
  }
195
+
196
  $products = $this->gather_products();
197
 
198
  foreach ( $products as $product ) {
js/gutenberg-block.js DELETED
@@ -1,117 +0,0 @@
1
- ( function( blocks, components, i18n, element, _ ) {
2
- var el = element.createElement;
3
-
4
- var ecwidStoreParams = {
5
- title: EcwidGutenbergParams.title,
6
- icon: el('div', {className:"ecwid-store-block-icon"}),
7
- category: 'common',
8
- attributes: {
9
- widgets: { type: 'string' },
10
- categories_per_row: { type: 'integer' },
11
- grid: { type: 'string' },
12
- list: { type: 'integer' },
13
- table: { type: 'integer' },
14
- default_category_id: { type: 'integer' },
15
- default_product_id: { type: 'integer' },
16
- category_view: { type: 'string' },
17
- search_view: { type: 'string' },
18
- minicart_layout: {type: 'string' }
19
- },
20
- useOnce: true,
21
-
22
- edit: function( props ) {
23
-
24
- return el( 'div', {className: 'ecwid-store-block' },
25
- el( 'button', { className: 'button button-primary ecwid-store-block-button', onClick: function() { ecwid_open_store_popup( props ); } }, i18n.__( 'Edit Appearance' ) )
26
- );
27
- },
28
- save: function( props ) {
29
- var shortcode = new wp.shortcode({
30
- 'tag': EcwidGutenbergParams.storeShortcodeName,
31
- 'attrs': props.attributes,
32
- 'type': 'single'
33
- });
34
-
35
- return el( element.RawHTML, null, shortcode.string() );
36
- },
37
-
38
- transforms: {
39
- from: [{
40
- type: 'shortcode',
41
- tag: ['ecwid', 'ec_store'],
42
- attributes: {
43
- widgets: {
44
- type: 'string',
45
- shortcode: function(named) {
46
- return named.widgets
47
- }
48
- },
49
- categories_per_row: {
50
- type: 'integer',
51
- shortcode: function(named) {
52
- return named.categories_per_row
53
- }
54
- },
55
- grid: {
56
- type: 'string',
57
- shortcode: function(named) {
58
- return named.grid
59
- }
60
- },
61
- list: {
62
- type: 'integer',
63
- shortcode: function(named) {
64
- return named.list
65
- }
66
- },
67
- table: {
68
- type: 'integer',
69
- shortcode: function(named) {
70
- return named.table
71
- }
72
- },
73
- default_category_id: {
74
- type: 'integer',
75
- shortcode: function(named) {
76
- return named.default_category_id
77
- }
78
- },
79
- default_product_id: {
80
- type: 'integer',
81
- shortcode: function(named) {
82
- return named.default_product_id
83
- }
84
- },
85
- category_view: {
86
- type: 'string',
87
- shortcode: function(named) {
88
- return named.category_view
89
- }
90
- },
91
- search_view: {
92
- type: 'string',
93
- shortcode: function(named) {
94
- return named.search_view
95
- }
96
- },
97
- minicart_layout: {
98
- type: 'string',
99
- shortcode: function(named) {
100
- return named.minicart_layout
101
- }
102
- }
103
- },
104
- priority: 10
105
- }]
106
- },
107
- };
108
- blocks.registerBlockType( EcwidGutenbergParams.storeBlock, ecwidStoreParams);
109
-
110
- } )(
111
- window.wp.blocks,
112
- window.wp.components,
113
- window.wp.i18n,
114
- window.wp.element,
115
- window._
116
- );
117
- ecwid_pb_defaults = EcwidGutenbergParams.ecwid_pb_defaults;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: Ecwid
3
  Tags: ecommerce, downloadable products, Facebook ecommerce, online store, paypal, product catalog, shop, shopping cart, store
4
  Requires at least: 3.7
5
  Tested up to: 4.9
6
- Stable tag: 6.3.1
7
 
8
  Powerful, easy to use ecommerce shopping cart. Bank level PCI DSS Level 1 security. iPhone & Android apps. Superb support. Free plan available.
9
 
@@ -151,6 +151,9 @@ You can use Ecwid’s built-in import tools to copy your store products from any
151
  * [Ecwid eCommerce Forums](https://www.ecwid.com/forums/forumdisplay.php?f=19)
152
 
153
  == Changelog ==
 
 
 
154
  = 6.3.1 - Sep 26, 2018 =
155
  - **Several fixes and improvements.**
156
 
3
  Tags: ecommerce, downloadable products, Facebook ecommerce, online store, paypal, product catalog, shop, shopping cart, store
4
  Requires at least: 3.7
5
  Tested up to: 4.9
6
+ Stable tag: 6.3.2
7
 
8
  Powerful, easy to use ecommerce shopping cart. Bank level PCI DSS Level 1 security. iPhone & Android apps. Superb support. Free plan available.
9
 
151
  * [Ecwid eCommerce Forums](https://www.ecwid.com/forums/forumdisplay.php?f=19)
152
 
153
  == Changelog ==
154
+ = 6.3.2 - Oct 1, 2018 =
155
+ - **Fixed a problem with the WordPress admin menu items.** In some cases, the WordPress admin navigation froze when an Ecwid store admin page was opened. Now everything should work fine.
156
+
157
  = 6.3.1 - Sep 26, 2018 =
158
  - **Several fixes and improvements.**
159
 
templates/connect.php DELETED
@@ -1,52 +0,0 @@
1
- <div class="wrap ecwid-admin ecwid-connect<?php if ($no_oauth): ?> no-oauth<?php else: ?> with-oauth<?php endif; ?>">
2
- <div class="box">
3
- <?php require ECWID_PLUGIN_DIR . 'templates/admin-head.php'; ?>
4
-
5
- <div class="greeting-image">
6
- <img src="<?php echo(esc_attr(ECWID_PLUGIN_URL)); ?>/images/store_inprogress.png" width="142" />
7
- </div>
8
-
9
- <div class="greeting-message mobile-br">
10
- <?php _e( 'Connect your store<br /> to this WordPress site', 'ecwid-shopping-cart' ); ?>
11
- </div>
12
-
13
- <div class="connect-store-id no-oauth">
14
- <input type="text" id="ecwid-store-id" placeholder="<?php _e('Enter your Store ID', 'ecwid-shopping-cart'); ?>" />
15
- </div>
16
- <div class="connect-button">
17
- <a href="admin-post.php?action=ec_connect" class="with-oauth"><?php _e( 'Connect', 'ecwid-shopping-cart' ); ?></a>
18
- <a id="ecwid-connect-no-oauth" href="admin-post.php?action=ec_connect" class="no-oauth" style="white-space: nowrap; width:auto"><?php _e( 'Save and connect', 'ecwid-shopping-cart' ); ?></a>
19
- </div>
20
-
21
- <?php if (!$connection_error): ?>
22
-
23
- <div class="note initial with-oauth">
24
- <?php printf( __( 'To display your store on this site, you need to allow WordPress to access your %1$s products. Please press connect to provide permission.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
25
- </div>
26
-
27
- <?php else: ?>
28
-
29
- <div class="note auth-error">
30
- <span>
31
- <?php _e( 'Connection error - after clicking button you need to login and accept permissions to use our plugin. Please, try again.', 'ecwid-shopping-cart' ); ?>
32
- </span>
33
- </div>
34
- <?php endif; ?>
35
-
36
- <?php if ($no_oauth): ?>
37
- <h4 class="no-oauth where-to-find-store-id" style="text-align: center"><?php _e('Where to find your Store ID:', 'ecwid-shopping-cart'); ?></h4>
38
- <div class="note no-oauth">
39
- <?php printf( __( 'Store ID is a unique identifier of your %1$s account. You can find it in your %1$s control panel: open the <a %2$s>Dashboard page</a> and find the "<b>Store ID: NNNNNNN</b>" text, where <b>NNNNNNN</b> is your Store&nbsp;ID.', 'ecwid-shopping-cart'), Ecwid_Config::get_brand(), 'href="https://' . Ecwid_Config::get_cpanel_domain() . '/cp/CP.html?source=wporg#dashboard" target="_blank"' ); ?>
40
- </div>
41
- <?php endif; ?>
42
-
43
- <?php if ( !Ecwid_Config::is_no_reg_wl() ): ?>
44
- <div class="create-account-link">
45
- <a target="_blank" href="<?php echo esc_attr(ecwid_get_register_link()); ?>">
46
- <?php printf( __( "Don't have an %s account? Create one now.", 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
47
- </a>
48
- </div>
49
- <?php endif; ?>
50
- </div>
51
- <?php require ECWID_PLUGIN_DIR . 'templates/admin-footer.php'; ?>
52
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
templates/dashboard.php DELETED
@@ -1,65 +0,0 @@
1
- <div class="wrap ecwid-admin ecwid-dashboard">
2
- <div class="box">
3
- <div class="head">
4
- <?php ecwid_embed_svg( 'ecwid-logo-blue' );?>
5
- <h3>
6
- <?php printf( __( '%s Shopping Cart', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
7
- </h3>
8
- <div class="store-id drop-down">
9
- <span>
10
- <?php _e( 'Store ID', 'ecwid-shopping-cart' ); ?> : <?php echo get_ecwid_store_id(); ?>
11
- </span>
12
- <ul>
13
- <li>
14
- <a href="admin.php?page=ec-store&reconnect"><?php _e( 'Disconnect store', 'ecwid-shopping-cart' ); ?></a>
15
- </li>
16
- </ul>
17
- </div>
18
- </div>
19
- <div class="body">
20
- <div class="greeting-image">
21
- <img src="<?php echo(esc_attr(ECWID_PLUGIN_URL)); ?>/images/store_ready.png" width="142" />
22
- </div>
23
-
24
- <div class="greeting">
25
- <?php if (@$_GET['settings-updated']): ?>
26
- <div class="greeting-title">
27
- <?php _e('Congratulations!', 'ecwid-shopping-cart'); ?>
28
- </div>
29
- <div class="greeting-message mobile-br">
30
- <?php printf( __( 'Your %s store is now connected<br /> to your WordPress website', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
31
- </div>
32
- <?php else: ?>
33
-
34
- <div class="greeting-title">
35
- <?php _e('Greetings!', 'ecwid-shopping-cart'); ?>
36
- </div>
37
- <div class="greeting-message mobile-br">
38
- <?php printf( __( 'Your %s store is connected<br /> to your WordPress website', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
39
- </div>
40
- <?php endif; ?>
41
-
42
- <ul class="greeting-links">
43
- <li>
44
- <a target="_blank" href="<?php echo Ecwid_Store_Page::get_store_url(); ?>"><?php _e('Visit storefront', 'ecwid-shopping-cart'); ?></a>
45
- </li>
46
- <li>
47
- <a target="_blank"
48
- <?php if (ecwid_get_admin_sso_url(time(), '') ): ?>
49
- href="admin-post.php?action=ecwid-do-sso"
50
- <?php else: ?>
51
- href="//<?php echo Ecwid_Config::get_cpanel_domain(); ?>/cp?source=wporg"
52
- <?php endif; ?>
53
-
54
- ><?php _e('Open control panel', 'ecwid-shopping-cart'); ?></a>
55
- </li>
56
- </ul>
57
-
58
-
59
-
60
- </div>
61
- </div>
62
- </div>
63
-
64
- <?php require ECWID_PLUGIN_DIR . 'templates/admin-footer.php'; ?>
65
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
templates/ecwid-admin.php CHANGED
@@ -30,20 +30,11 @@
30
  jQuery('li[data-ecwid-dynamic-menu]').remove();
31
  ecwidAddMenuItems(jQuery.parseJSON(result));
32
  ecwidRefreshEcwidMenuItemSelection();
33
- if (typeof wpResponsive == 'object' && wpResponsive.activate) {
34
- wpResponsive.activate(); // prevent 'sticky-menu' from being applied incorrectly
35
- }
36
  }
37
  });
38
-
39
-
40
- //ecwidUpdateAdminMenus(e.data.data.navigationMenuItems);
41
- }
42
-
43
- if (typeof wpResponsive == 'object' && wpResponsive.activate) {
44
- wpResponsive.activate(); // prevent 'sticky-menu' from being applied incorrectly
45
- }
46
- },false);
47
 
48
  $('#ecwid-frame').attr('src', '<?php echo $iframe_src; ?>');
49
  ecwidSetPopupCentering('#ecwid-frame');
30
  jQuery('li[data-ecwid-dynamic-menu]').remove();
31
  ecwidAddMenuItems(jQuery.parseJSON(result));
32
  ecwidRefreshEcwidMenuItemSelection();
33
+ jQuery(window).trigger('resize');
 
 
34
  }
35
  });
36
+ }
37
+ },false);
 
 
 
 
 
 
 
38
 
39
  $('#ecwid-frame').attr('src', '<?php echo $iframe_src; ?>');
40
  ecwidSetPopupCentering('#ecwid-frame');
templates/importer/woo-complete.tpl.php CHANGED
@@ -8,10 +8,12 @@
8
  <li>
9
  <?php echo sprintf( __( 'Imported products: %s', 'ecwid-shopping-cart' ), '<span id="import-results-products"></span>' ); ?>
10
  </li>
 
11
  <li>
12
  <?php echo sprintf( __( 'Imported categories: %s', 'ecwid-shopping-cart' ), '<span id="import-results-categories"></span>' ); ?>
13
  </li>
14
  </ul>
 
15
 
16
  <p>
17
  <a class="button button-primary" href="admin.php?page=<?php echo Ecwid_Admin::ADMIN_SLUG; ?>-admin-products">
8
  <li>
9
  <?php echo sprintf( __( 'Imported products: %s', 'ecwid-shopping-cart' ), '<span id="import-results-products"></span>' ); ?>
10
  </li>
11
+ <?php if ( ecwid_is_paid_account() ): ?>
12
  <li>
13
  <?php echo sprintf( __( 'Imported categories: %s', 'ecwid-shopping-cart' ), '<span id="import-results-categories"></span>' ); ?>
14
  </li>
15
  </ul>
16
+ <?php endif; ?>
17
 
18
  <p>
19
  <a class="button button-primary" href="admin.php?page=<?php echo Ecwid_Admin::ADMIN_SLUG; ?>-admin-products">
templates/importer/woo-main.tpl.php CHANGED
@@ -10,28 +10,32 @@
10
  <h2><?php _e( 'Import summary.', 'ecwid-shopping-cart' ); ?></h2>
11
  <p>
12
  <?php
13
- echo sprintf(
14
- __( 'Your WooCommerce store has %s products and %s categories', 'ecwid-shopping-cart' ),
15
- Ecwid_Importer::count_woo_products(),
16
- Ecwid_Importer::count_woo_categories()
17
- );
18
  ?>
19
  </p>
20
  <p>
21
  <?php
22
- echo sprintf(
23
- __( 'Your %s store has %s products and %s categories', 'ecwid-shopping-cart' ),
24
- Ecwid_Config::get_brand(),
 
 
25
  Ecwid_Importer::count_ecwid_products(),
26
  Ecwid_Importer::count_ecwid_categories()
27
- );
28
  ?>
29
  </p>
30
  <p>
31
  <?php
32
  echo sprintf(
33
- __( 'After import, your %s store will have %s products and %s categories', 'ecwid-shopping-cart' ),
34
- Ecwid_Config::get_brand(),
 
 
35
  Ecwid_Importer::count_ecwid_products() + Ecwid_Importer::count_woo_products(),
36
  Ecwid_Importer::count_ecwid_categories() + Ecwid_Importer::count_woo_categories()
37
  );
10
  <h2><?php _e( 'Import summary.', 'ecwid-shopping-cart' ); ?></h2>
11
  <p>
12
  <?php
13
+ _e( 'Your WooCommerce store has ', 'ecwid-shopping-cart' );
14
+ echo $this->_get_products_categories_message(
15
+ Ecwid_Importer::count_woo_products(),
16
+ Ecwid_Importer::count_woo_categories()
17
+ );
18
  ?>
19
  </p>
20
  <p>
21
  <?php
22
+ printf(
23
+ __( 'Your %s store has ', 'ecwid-shopping-cart' ),
24
+ Ecwid_Config::get_brand()
25
+ );
26
+ echo $this->_get_products_categories_message(
27
  Ecwid_Importer::count_ecwid_products(),
28
  Ecwid_Importer::count_ecwid_categories()
29
+ );
30
  ?>
31
  </p>
32
  <p>
33
  <?php
34
  echo sprintf(
35
+ __( 'After import, your %s store will have ', 'ecwid-shopping-cart' ),
36
+ Ecwid_Config::get_brand()
37
+ );
38
+ echo $this->_get_products_categories_message(
39
  Ecwid_Importer::count_ecwid_products() + Ecwid_Importer::count_woo_products(),
40
  Ecwid_Importer::count_ecwid_categories() + Ecwid_Importer::count_woo_categories()
41
  );
templates/landing.php DELETED
@@ -1,165 +0,0 @@
1
- <script type='text/javascript'>//<![CDATA[
2
- document.body.className += ' ecwid-no-padding';
3
- //]]>
4
- </script>
5
- <div class="ecwid-landing <?php echo $register ? 'register' : 'connect'; echo $connection_error ? ' conn-error': ''; ?>">
6
- <div class="ecwid-thank">
7
- <h1>
8
- <?php printf( __( 'Welcome to %s!', 'ecwid-shopping-cart'), Ecwid_Config::get_brand() ); ?>
9
- <span><?php printf( __( 'Thank you for choosing %s to build your online store. The first step to sell successfully online is to set up your store! Let’s get started and add a store to your website in a few simple steps.', 'ecwid-shopping-cart'), Ecwid_Config::get_brand() ); ?></span>
10
- </h1>
11
-
12
- <div class="ecwid-button">
13
-
14
- <button class="create-store-button btn btn-primary btn-large">
15
- <?php _e( 'Create Store', 'ecwid-shopping-cart' ); ?>
16
- </button>
17
- <button class="create-store-loading btn btn-primary btn-large btn-loading">
18
- <div class="loader">
19
- <div class="ecwid-spinner spin-right">
20
- <svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
21
- <path class="loader-outer" d="M30,60 C46.5685425,60 60,46.5685425 60,30 C60,13.4314575 46.5685425,0 30,0 C13.4314575,0 0,13.4314575 0,30 C0,46.5685425 13.4314575,60 30,60 L30,60 Z"></path>
22
- <path class="loader-background" d="M30,56 C44.3594035,56 56,44.3594035 56,30 C56,15.6405965 44.3594035,4 30,4 C15.6405965,4 4,15.6405965 4,30 C4,44.3594035 15.6405965,56 30,56 L30,56 Z" fill="#FFFFFF"></path>
23
- <path class="loader-inner" d="M12.0224719,32.0224719 C10.9078652,32.0224719 10,31.1146067 10,30 C10,18.9707865 18.9707865,10 30,10 C31.1146067,10 32.0224719,10.9078652 32.0224719,12.0224719 C32.0224719,13.1370787 31.1146067,14.0449438 30,14.0449438 C21.2,14.0449438 14.0449438,21.2 14.0449438,30 C14.0449438,31.1146067 13.1370787,32.0224719 12.0224719,32.0224719 L12.0224719,32.0224719 Z M30,50 C28.8853933,50 27.9775281,49.0921348 27.9775281,47.9775281 C27.9775281,46.8629213 28.8853933,45.9550562 30,45.9550562 C38.8,45.9550562 45.9550562,38.8 45.9550562,30 C45.9550562,28.8853933 46.8629213,27.9775281 47.9775281,27.9775281 C49.0921348,27.9775281 50,28.8853933 50,30 C50,41.0292135 41.0292135,50 30,50 L30,50 Z" fill="#231F20"></path>
24
- </svg>
25
- </div>
26
- </div>
27
- </button>
28
-
29
- <button class="create-store-success btn btn-large btn-success btn-icon">
30
- <i class="icon-check"></i>
31
- <?php _e('Store is created', 'ecwid-shopping-cart'); ?>
32
- </button>
33
-
34
- <div class="create-store-loading-note ecwid-button-description">
35
- <?php _e('Creating store', 'ecwid-shopping-cart'); ?>
36
- </div>
37
-
38
- <div class="create-store-success-note ecwid-button-description">
39
- <?php _e('Preparing your store dashboard', 'ecwid-shopping-cart'); ?>
40
- </div>
41
-
42
- <div class="button-description-mobile">
43
- <?php _e('Free registration, No credit card required', 'ecwid-shopping-cart'); ?>
44
- </div>
45
- <div class="button-description-mobile on-error ecwid-connection-error">
46
- <?php printf( __( 'Connection error: please click the button again and give permissions for this plugin<br /> to show your %s store on this site.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
47
- </div>
48
- <div class="create-store-have-account ecwid-button-description">
49
- <span class="create-store-have-account-question"><?php printf( __( 'Already have %s account?', 'ecwid-shopping-cart'), Ecwid_Config::get_brand() ); ?></span>
50
- <a class="create-store-have-account-link" href="admin-post.php?action=ec_connect"><?php _e('Connect your store to this site', 'ecwid-shopping-cart'); ?></a>
51
- </div>
52
- <div class="button-description-mobile">
53
- <?php printf( __( 'You will be asked to log in to your %s Control Panel<br />and give permissions to show your store on this site', 'ecwid-shopping-cart'), Ecwid_Config::get_brand() ); ?>
54
- </div>
55
- <div class="button-description-mobile">
56
- <h3><?php _e('Get ready to sell online', 'ecwid-shopping-cart'); ?></h3>
57
- </div>
58
- </div>
59
- <div class="ecwid-thank-background">
60
- <div class="ecwid-thank-background-tablet"><img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/tablet-iphone.png"></div>
61
- </div>
62
- </div>
63
- <div class="ecwid-description">
64
- <div class="ecwid-description-inner">
65
- <div class="ecwid-description-image"><img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/ecwid-description-image.jpg"></div>
66
- <div class="ecwid-description-text">
67
- <h2><?php _e( 'Sell Everywhere', 'ecwid-shopping-cart'); ?></h2>
68
- <p><?php _e('Start selling on your WordPress site. Then mirror your shop on your Facebook page, blog and marketplaces like Google Shopping, Yahoo and Shopping.com.', 'ecwid-shopping-cart'); ?></p>
69
- <p><?php printf( __( 'Use %s\'s mobile-POS to swipe credit cards and sell on the go. Your orders and inventory are always synchronized with your online store.', 'ecwid-shopping-cart'), Ecwid_Config::get_brand() ); ?></p>
70
- </div>
71
- </div>
72
- </div>
73
- <div class="ecwid-features">
74
- <div class="ecwid-features-inner">
75
- <h2><?php _e('Features', 'ecwid-shopping-cart'); ?></h2>
76
- <div class="ecwid-features-top">
77
- <div class="ecwid-features-top-item">
78
- <div class="ecwid-features-top-item-image">
79
- <img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/wordpress.svg">
80
- </div>
81
- <div class="ecwid-features-top-item-text">
82
- <h3><?php _e('Compatible with your theme', 'ecwid-shopping-cart'); ?></h3>
83
- <p><?php printf( __( '%s is compatible with your<br>“%s” WordPress theme<br>out of the box.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand(), ecwid_get_theme_name() ); ?></p>
84
- </div>
85
- </div>
86
- <div class="ecwid-features-top-item">
87
- <div class="ecwid-features-top-item-image">
88
- <img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/gift.svg" class="gift">
89
- </div>
90
- <div class="ecwid-features-top-item-text">
91
- <h3><?php _e('Free and always up to date', 'ecwid-shopping-cart'); ?></h3>
92
- <p><?php _e('Free plan always available with tons of features<br>at no additional cost. Updates are seamless, automatic<br>and free of charge.', 'ecwid-shopping-cart'); ?></p>
93
- </div>
94
- </div>
95
- </div>
96
- <div class="ecwid-features-bottom">
97
- <div class="ecwid-features-bottom-item">
98
- <div class="ecwid-features-bottom-item-image">
99
- <img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/responsive-grow.svg">
100
- </div>
101
- <div class="ecwid-features-bottom-item-text">
102
- <h3><?php _e('Responsive design', 'ecwid-shopping-cart'); ?></h3>
103
- <p><?php _e('Your store looks perfect<br />on all devices', 'ecwid-shopping-cart'); ?></p>
104
- </div>
105
- </div>
106
- <div class="ecwid-features-bottom-item">
107
- <div class="ecwid-features-bottom-item-image">
108
- <img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/secure-pci.svg" class="secure">
109
- </div>
110
- <div class="ecwid-features-bottom-item-text">
111
- <h3><?php _e('PCI DSS Certified', 'ecwid-shopping-cart'); ?></h3>
112
- <p><?php _e('Secure checkout with over 40<br />payment options', 'ecwid-shopping-cart'); ?></p>
113
- </div>
114
- </div>
115
- <div class="ecwid-features-bottom-item">
116
- <div class="ecwid-features-bottom-item-image">
117
- <img src="<?php echo ECWID_PLUGIN_URL; ?>images/landing/global.svg">
118
- </div>
119
- <div class="ecwid-features-bottom-item-text">
120
- <h3><?php _e('Global Reach', 'ecwid-shopping-cart'); ?></h3>
121
- <p><?php _e('Over 1 million merchants in 175 countries', 'ecwid-shopping-cart'); ?></p>
122
- </div>
123
- </div>
124
- </div>
125
- </div>
126
- </div>
127
- <div class="ecwid-start">
128
- <h2><?php _e('Start selling <br>on your WordPress <nobr>site for free</nobr>', 'ecwid-shopping-cart'); ?>
129
- </h2>
130
- <div class="ecwid-button">
131
- <button class="create-store-button btn btn-primary btn-large">
132
- <?php _e( 'Create Store', 'ecwid-shopping-cart'); ?>
133
- </button>
134
- <button class="create-store-loading btn btn-primary btn-large btn-loading">
135
- <div class="loader">
136
- <div class="ecwid-spinner spin-right">
137
- <svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
138
- <path class="loader-outer" d="M30,60 C46.5685425,60 60,46.5685425 60,30 C60,13.4314575 46.5685425,0 30,0 C13.4314575,0 0,13.4314575 0,30 C0,46.5685425 13.4314575,60 30,60 L30,60 Z"></path>
139
- <path class="loader-background" d="M30,56 C44.3594035,56 56,44.3594035 56,30 C56,15.6405965 44.3594035,4 30,4 C15.6405965,4 4,15.6405965 4,30 C4,44.3594035 15.6405965,56 30,56 L30,56 Z" fill="#FFFFFF"></path>
140
- <path class="loader-inner" d="M12.0224719,32.0224719 C10.9078652,32.0224719 10,31.1146067 10,30 C10,18.9707865 18.9707865,10 30,10 C31.1146067,10 32.0224719,10.9078652 32.0224719,12.0224719 C32.0224719,13.1370787 31.1146067,14.0449438 30,14.0449438 C21.2,14.0449438 14.0449438,21.2 14.0449438,30 C14.0449438,31.1146067 13.1370787,32.0224719 12.0224719,32.0224719 L12.0224719,32.0224719 Z M30,50 C28.8853933,50 27.9775281,49.0921348 27.9775281,47.9775281 C27.9775281,46.8629213 28.8853933,45.9550562 30,45.9550562 C38.8,45.9550562 45.9550562,38.8 45.9550562,30 C45.9550562,28.8853933 46.8629213,27.9775281 47.9775281,27.9775281 C49.0921348,27.9775281 50,28.8853933 50,30 C50,41.0292135 41.0292135,50 30,50 L30,50 Z" fill="#231F20"></path>
141
- </svg>
142
- </div>
143
- </div>
144
- </button>
145
-
146
- <button class="create-store-success btn btn-large btn-success btn-icon">
147
- <i class="icon-check"></i>
148
- <?php _e('Store is created', 'ecwid-shopping-cart'); ?>
149
- </button>
150
-
151
- <div class="create-store-loading-note ecwid-button-description">
152
- <?php _e('Creating store', 'ecwid-shopping-cart'); ?>
153
- </div>
154
-
155
- <div class="create-store-success-note ecwid-button-description">
156
- <?php _e('Preparing your store dashboard', 'ecwid-shopping-cart'); ?>
157
- </div>
158
-
159
- <div class="ecwid-button-description">
160
- <?php printf( __( 'Already have %s account?', 'ecwid-shopping-cart'), Ecwid_Config::get_brand() ); ?>
161
- <a href="admin-post.php?action=ec_connect"><?php _e('Connect your store to this site', 'ecwid-shopping-cart'); ?></a>
162
- </div>
163
- </div>
164
- </div>
165
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
templates/reconnect.php DELETED
@@ -1,48 +0,0 @@
1
- <div class="wrap ecwid-admin ecwid-connect ecwid-reconnect">
2
- <div class="box">
3
- <?php require ECWID_PLUGIN_DIR . 'templates/admin-head.php'; ?>
4
-
5
- <div class="greeting-image">
6
- <img src="<?php echo(esc_attr(ECWID_PLUGIN_URL)); ?>/images/store_inprogress.png" width="142" />
7
- </div>
8
-
9
- <div class="greeting-message mobile-br">
10
- <?php _e( 'Connect your store<br /> to this WordPress site', 'ecwid-shopping-cart' ); ?>
11
- </div>
12
-
13
- <?php if ($ecwid_oauth->get_reconnect_message()): ?>
14
- <div class="note reconnect-message">
15
- <?php echo $ecwid_oauth->get_reconnect_message(); ?>
16
- </div>
17
- <?php endif; ?>
18
-
19
- <div class="connect-button">
20
- <a href="admin-post.php?action=ec_connect&reconnect"><?php _e( 'Connect', 'ecwid-shopping-cart' ); ?></a>
21
- </div>
22
-
23
- <?php if ($connection_error && $ecwid_oauth->get_error() == 'cancelled'): ?>
24
-
25
-
26
- <div class="note auth-error">
27
- <span>
28
- <?php _e( 'Connection error - after clicking button you need to login and accept permissions to use our plugin. Please, try again.', 'ecwid-shopping-cart' ); ?>
29
- </span>
30
- </div>
31
-
32
- <?php elseif ($connection_error && $ecwid_oauth->get_error() == 'other'): ?>
33
-
34
- <div class="note auth-error">
35
- <span>
36
- <?php printf( __( 'Looks like your site does not support remote POST requests that are required for %s API to work. Please, contact your hosting provider to enable cURL.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
37
- </span>
38
- </div>
39
-
40
- <?php else: ?>
41
-
42
- <div class="note">
43
- <?php printf( __( 'To sell using %1$s, you must allow WordPress to access the %1$s plugin. The connect button will direct you to your %1$s account where you can provide permission.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ); ?>
44
- </div>
45
- <?php endif; ?>
46
- </div>
47
- <?php require_once ECWID_PLUGIN_DIR . 'templates/admin-footer.php'; ?>
48
- </div>