Merge pull request #333 from Ecwid/dev

Dev

Author: meteor-ec

CHANGELOG.txt

@@ -1,4 +1,9 @@
 == Changelog ==
+= 7.0.1 - Apr 8, 2025 =
+- **WordPress 6.8 compatibility.** The new WordPress version will be released soon. The Ecwid ecommerce shopping cart plugin is ready for the new release — everything works well in your WordPress admin and storefront pages. Feel free to upgrade your site to WordPress 6.8.
+- Added support for URLs without ID feature in the sitemap and store menus.
+- Fixed an issue where storefront URLs were missing a slash in certain cases when the URLs without ID feature was enabled.
+
 = 7.0 - Mar 26, 2025 =
 - **New clean and SEO-friendly URLs for your product and category pages—no more random numbers!** We’ve introduced a new format for product and category page links. Now, you can remove those auto-generated numbers, making them cleaner and better for SEO. For example, instead of `/shoes-c123`, your URL slug can simply be `/shoes`! To activate this feature, go to "WordPress admin → Ecwid → Storefront", scroll down, and enable "Set URL slugs without IDs for products and categories". If you’re on a Business or Unlimited plan, you can also customize product and category slugs however you like for a more personalized and SEO-friendly URL.
 

ecwid-shopping-cart.php

@@ -2,10 +2,10 @@
 /*
 Plugin Name: Ecwid by Lightspeed Ecommerce Shopping Cart
 Plugin URI: http://www.ecwid.com?partner=wporg
-Description: Ecwid by Lightspeed 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.
+Description: Ecwid by Lightspeed is a full-featured shopping cart. It can be easily integrated with any Wordpress blog and takes less than 5 minutes to set up.
 Text Domain: ecwid-shopping-cart
 Author: Ecwid Ecommerce
-Version: 7.0
+Version: 7.0.1
 Author URI: https://ecwid.to/ecwid-site
 License: GPLv2 or later
 */

includes/class-ecwid-html-meta.php

@@ -123,7 +123,16 @@ public function wp_head_last() {
 	protected function _print_description() {
 		$description_html = false;
 
-		if ( ecwid_is_applicable_escaped_fragment() || Ecwid_Seo_Links::is_product_browser_url() ) {
+        if( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+            $slug = Ecwid_Static_Page::get_current_storefront_page_slug();
+            $noindex_pages = Ecwid_Seo_Links::get_noindex_pages();
+            
+            $is_internal_catalog_page = ! empty( $slug ) && ! in_array( $slug, $noindex_pages );
+        } else {
+            $is_internal_catalog_page = Ecwid_Seo_Links::is_product_browser_url();
+        }
+
+		if ( ecwid_is_applicable_escaped_fragment() || $is_internal_catalog_page ) {
 			$description_html = Ecwid_Static_Page::get_meta_description_html();
 		} elseif ( Ecwid_Store_Page::is_store_page() ) {
 			$set_metadesc = false;

includes/class-ecwid-sitemap-builder.php

@@ -29,7 +29,7 @@ public function generate( $page_num ) {
 				$categories = $api->get_categories(
 					array(
 						'offset' => $offset,
-						'limit'  => $limit,
+						'limit'  => $limit
 					)
 				);
 

includes/class-ecwid-static-page.php

@@ -142,7 +142,7 @@ protected static function maybe_fetch_data() {
 			}
 		}
 
-		if ( ! ecwid_is_demo_store() ) {
+		if ( self::is_need_use_new_endpoint() ) {
             $query_params['baseUrl'] = get_permalink();
 
 			$query_params['getStaticContent'] = 'true';
@@ -253,6 +253,7 @@ protected static function process_page_status( $data, $cache_key = null ) {
 
             if( $data->status === 'NONCANONICAL' ) {
                 $permalink = get_permalink();
+                $permalink = trailingslashit( $permalink );
                 wp_redirect( $permalink . $data->canonicalSlug, 301 );
                 exit;
             }
@@ -270,7 +271,7 @@ protected static function process_page_status( $data, $cache_key = null ) {
 
 	protected static function get_static_snapshot( $endpoint_params, $query_params, $dynamic_css = '' ) {
 
-		if ( ! ecwid_is_demo_store() ) {
+		if ( self::is_need_use_new_endpoint() ) {
 			$api          = new Ecwid_Api_V3();
 			$data = $api->get_storefront_widget_page( $query_params );
 
@@ -335,6 +336,16 @@ protected static function get_static_snapshot( $endpoint_params, $query_params,
 		return null;
 	}
 
+    protected static function is_need_use_new_endpoint() {
+        $is_token_valid = Ecwid_Api_V3::get_api_status() === Ecwid_Api_V3::API_STATUS_OK;
+
+		if ( ! ecwid_is_demo_store() && Ecwid_Seo_Links::is_slugs_without_ids_enabled() && $is_token_valid ) {
+            return true;
+        }
+
+        return false;
+    }
+
     protected static function get_cache_key( $query_params, $endpoint_params ) {
         return serialize( array_merge( $query_params, $endpoint_params ) );
     }
@@ -471,6 +482,10 @@ public static function is_enabled_static_home_page() {
 			return false;
 		}
 
+		if ( isset( $store_page_params['show_root_categories'] ) && $store_page_params['show_root_categories'] === false ) {
+			return false;
+		}
+
 		if ( array_key_exists( 'ec-enable-static-page', $_GET ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return true;
 		}

js/admin-menu.js

@@ -79,9 +79,9 @@ function ecwidApplyIframeAdminMenu($link, menu) {
             }
 
             if (jQuery(this).hasClass('current')) {
-                if (slug != 'ec-store-admin-products') {
-                    return false;
-                }
+                // if (slug != 'ec-store-admin-products') {
+                return false;
+                // }
             }
 
             if (ecwid_params.is_demo_store) {

lib/ecwid_api_v3.php

@@ -168,7 +168,7 @@ public function get_categories( $input_params ) {
 			$params['parent'] = $input_params['parent'];
 		}
 
-		$passthru = array( 'offset', 'limit', 'parent', 'baseUrl', 'cleanUrls', 'hidden_categories', 'responseFields' );
+		$passthru = array( 'offset', 'limit', 'parent', 'baseUrl', 'cleanUrls', 'hidden_categories', 'responseFields', 'slugsWithoutIds', 'slugsWithoutIds' );
 		foreach ( $passthru as $name ) {
 			if ( array_key_exists( $name, $input_params ) ) {
 				$params[ $name ] = $input_params[ $name ];
@@ -183,6 +183,10 @@ public function get_categories( $input_params ) {
 			$params['cleanUrls'] = 'true';
 		}
 
+		if ( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+			$params['slugsWithoutIds'] = 'true';
+		}
+
 		$options = $this->build_request_headers();
 
 		$url = $this->build_request_url(
@@ -261,6 +265,10 @@ public function get_category( $category_id ) {
 			$params['cleanUrls'] = 'true';
 		}
 
+        if ( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+			$params['slugsWithoutIds'] = 'true';
+		}
+
 		$options = $this->build_request_headers();
 
 		$url = $this->build_request_url(
@@ -319,6 +327,10 @@ public function get_product( $product_id ) {
 			$params['cleanUrls'] = 'false';
 		}
 
+        if ( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+			$params['slugsWithoutIds'] = 'true';
+		}
+
 		$options = $this->build_request_headers();
 
 		$url = $this->build_request_url(
@@ -350,7 +362,7 @@ public function get_product( $product_id ) {
 	public function search_products( $input_params ) {
 		$params = array();
 
-		$passthru = array( 'updatedFrom', 'offset', 'limit', 'sortBy', 'keyword', 'baseUrl', 'cleanUrls', 'category', 'productId' );
+		$passthru = array( 'updatedFrom', 'offset', 'limit', 'sortBy', 'keyword', 'baseUrl', 'cleanUrls', 'category', 'productId', 'slugsWithoutIds' );
 		foreach ( $passthru as $name ) {
 			if ( array_key_exists( $name, $input_params ) ) {
 				$params[ $name ] = (string) $input_params[ $name ];
@@ -365,6 +377,10 @@ public function search_products( $input_params ) {
 			$params['cleanUrls'] = 'true';
 		}
 
+        if ( Ecwid_Seo_Links::is_slugs_without_ids_enabled() ) {
+			$params['slugsWithoutIds'] = 'true';
+		}
+
 		$params['enabled'] = 'true';
 
 		if ( EcwidPlatform::get( 'hide_out_of_stock' ) ) {
@@ -450,7 +466,7 @@ public function get_deleted_products( $input_params ) {
 	public function get_products( $input_params ) {
 		$params = array();
 
-		$passthru = array( 'updatedFrom', 'offset', 'limit', 'sortBy', 'keyword', 'createdFrom', 'createdTo', 'sku', 'enabled', 'responseFields' );
+		$passthru = array( 'updatedFrom', 'offset', 'limit', 'sortBy', 'keyword', 'createdFrom', 'createdTo', 'sku', 'enabled', 'responseFields', 'slugsWithoutIds' );
 
 		foreach ( $passthru as $name ) {
 			if ( array_key_exists( $name, $input_params ) ) {

readme.txt

@@ -4,8 +4,8 @@ Tags: ecommerce, e-commerce, storefront, shopping cart, online store
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Requires at least: 4.4
-Tested up to: 6.7
-Stable tag: 7.0
+Tested up to: 6.8
+Stable tag: 7.0.1
 
 Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support.
 
@@ -153,6 +153,11 @@ You can use Ecwid’s built-in import tools to copy your store products from any
 * [Ecwid Help Center](http://help.ecwid.com "Ecwid Help")
 
 == Changelog ==
+= 7.0.1 - Apr 8, 2025 =
+- **WordPress 6.8 compatibility.** The new WordPress version will be released soon. The Ecwid ecommerce shopping cart plugin is ready for the new release — everything works well in your WordPress admin and storefront pages. Feel free to upgrade your site to WordPress 6.8.
+- Added support for URLs without ID feature in the sitemap and store menus.
+- Fixed an issue where storefront URLs were missing a slash in certain cases when the URLs without ID feature was enabled.
+
 = 7.0 - Mar 26, 2025 =
 - **New clean and SEO-friendly URLs for your product and category pages—no more random numbers!** We’ve introduced a new format for product and category page links. Now, you can remove those auto-generated numbers, making them cleaner and better for SEO. For example, instead of `/shoes-c123`, your URL slug can simply be `/shoes`! To activate this feature, go to "WordPress admin → Ecwid → Storefront", scroll down, and enable "Set URL slugs without IDs for products and categories". If you’re on a Business or Unlimited plan, you can also customize product and category slugs however you like for a more personalized and SEO-friendly URL.
 

templates/admin/legacy-connect.tpl.php

@@ -32,7 +32,7 @@
 					<li>
 						<h4><?php echo esc_html( sprintf( __( 'Register at %s', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ) ); ?></h4>
 						<div>
-							<?php echo esc_html( sprintf( __( 'Create a new %s account which you will use to manage your store and inventory. The registration is free.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ) ); ?>
+							<?php echo esc_html( sprintf( __( 'Create a new %s account which you will use to manage your store and inventory.', 'ecwid-shopping-cart' ), Ecwid_Config::get_brand() ) ); ?>
 						</div>
 						<div class="ecwid-account-buttons">
 

templates/admin/welcome-page.php

@@ -43,7 +43,7 @@
 						} else {
 							echo wp_kses_post(
 								sprintf(
-									__( 'To add your store to your website, put your %1$s Store ID in the field below. If you don\'t have an %1$s account yet, create one for free on the <a %2$s>%1$s website</a>.', 'ecwid-shopping-cart' ),
+									__( 'To add your store to your website, put your %1$s Store ID in the field below. If you don\'t have an %1$s account yet, create one on the <a %2$s>%1$s website</a>.', 'ecwid-shopping-cart' ),
 									Ecwid_Config::get_brand(),
 									'href="' . esc_attr( ecwid_get_register_link() ) . '" target="_blank"'
 								)