Changeset 3137594
- Timestamp:
- 08/19/2024 12:10:36 PM (20 months ago)
- Location:
- ecwid-shopping-cart
- Files:
-
- 2 added
- 16 edited
- 1 copied
-
tags/6.12.18 (copied) (copied from ecwid-shopping-cart/trunk)
-
tags/6.12.18/css/frontend.css (modified) (1 diff)
-
tags/6.12.18/ecwid-shopping-cart.php (modified) (2 diffs)
-
tags/6.12.18/includes/class-ecwid-config.php (modified) (3 diffs)
-
tags/6.12.18/includes/class-ecwid-products.php (modified) (4 diffs)
-
tags/6.12.18/includes/class-ecwid-seo-links.php (modified) (2 diffs)
-
tags/6.12.18/includes/class-ecwid-static-page.php (modified) (2 diffs)
-
tags/6.12.18/includes/integrations/class-ecwid-integration-jetpack.php (added)
-
tags/6.12.18/includes/shortcodes/class-ecwid-shortcode-productbrowser.php (modified) (2 diffs)
-
tags/6.12.18/readme.txt (modified) (2 diffs)
-
trunk/css/frontend.css (modified) (1 diff)
-
trunk/ecwid-shopping-cart.php (modified) (2 diffs)
-
trunk/includes/class-ecwid-config.php (modified) (3 diffs)
-
trunk/includes/class-ecwid-products.php (modified) (4 diffs)
-
trunk/includes/class-ecwid-seo-links.php (modified) (2 diffs)
-
trunk/includes/class-ecwid-static-page.php (modified) (2 diffs)
-
trunk/includes/integrations/class-ecwid-integration-jetpack.php (added)
-
trunk/includes/shortcodes/class-ecwid-shortcode-productbrowser.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ecwid-shopping-cart/tags/6.12.18/css/frontend.css
r2825702 r3137594 105 105 content: ''; 106 106 } 107 108 #dynamic-ec-store-container, 109 #static-ec-store-container { 110 margin-top: 0 !important; 111 } -
ecwid-shopping-cart/tags/6.12.18/ecwid-shopping-cart.php
r3131402 r3137594 6 6 Text Domain: ecwid-shopping-cart 7 7 Author: Ecwid Ecommerce 8 Version: 6.12.1 78 Version: 6.12.18 9 9 Author URI: https://ecwid.to/ecwid-site 10 10 License: GPLv2 or later … … 210 210 'sg-cachepress/sg-cachepress.php' => 'sg-optimizer', 211 211 'google-sitemap-generator/sitemap.php' => 'google-sitemap-generator', 212 'jetpack/jetpack.php' => 'jetpack', 212 213 ); 213 214 -
ecwid-shopping-cart/tags/6.12.18/includes/class-ecwid-config.php
r3093942 r3137594 2 2 3 3 class Ecwid_Config { 4 const IS_WL = 'whitelabel_is_enabled'; 5 const BRAND = 'whitelabel_brand'; 6 const KB_URL = 'whitelabel_kb_url'; 7 const CONTACT_US_URL = 'whitelabel_contact_us_url'; 8 const REGISTRATION_URL = 'whitelabel_registration_url'; 9 const CHANNEL_ID = 'whitelabel_channel_id'; 10 const OAUTH_APPID = 'whitelabel_oauth_appid'; 11 const OAUTH_APPSECRET = 'whitelabel_oauth_appsecret'; 12 const OAUTH_TOKEN_URL = 'whitelabel_oauth_token_url'; 13 const OAUTH_AUTH_URL = 'whitelabel_oauth_auth_url'; 14 const TOKEN = 'config_token'; 15 const STORE_ID = 'config_store_id'; 16 const API_DOMAIN = 'config_api_domain'; 17 const FRONTEND_DOMAIN = 'config_frontend_domain'; 18 const CPANEL_DOMAIN = 'config_cpanel_domain'; 19 const DEMO_STORE_ID = 'config_demo_store_id'; 4 const IS_WL = 'whitelabel_is_enabled'; 5 const BRAND = 'whitelabel_brand'; 6 const KB_URL = 'whitelabel_kb_url'; 7 const CONTACT_US_URL = 'whitelabel_contact_us_url'; 8 const REGISTRATION_URL = 'whitelabel_registration_url'; 9 const CHANNEL_ID = 'whitelabel_channel_id'; 10 const OAUTH_APPID = 'whitelabel_oauth_appid'; 11 const OAUTH_APPSECRET = 'whitelabel_oauth_appsecret'; 12 const OAUTH_TOKEN_URL = 'whitelabel_oauth_token_url'; 13 const OAUTH_AUTH_URL = 'whitelabel_oauth_auth_url'; 14 const TOKEN = 'config_token'; 15 const STORE_ID = 'config_store_id'; 16 const API_DOMAIN = 'config_api_domain'; 17 const STATIC_PAGES_API_DOMAIN = 'config_static_pages_api_domain'; 18 const FRONTEND_DOMAIN = 'config_frontend_domain'; 19 const CPANEL_DOMAIN = 'config_cpanel_domain'; 20 const DEMO_STORE_ID = 'config_demo_store_id'; 20 21 21 22 public static function is_wl() { … … 85 86 public static function get_api_domain() { 86 87 return EcwidPlatform::get( self::API_DOMAIN, 'app.ecwid.com' ); 88 } 89 90 public static function get_static_pages_api_domain() { 91 return EcwidPlatform::get( self::STATIC_PAGES_API_DOMAIN, 'storefront.ecwid.com' ); 87 92 } 88 93 … … 172 177 protected static function _get_common_config() { 173 178 $common_config = array( 174 self::OAUTH_APPID => 'oauth_appid', 175 self::OAUTH_APPSECRET => 'oauth_appsecret', 176 self::TOKEN => 'oauth_token', 177 self::STORE_ID => 'store_id', 178 self::CHANNEL_ID => 'channel_id', 179 self::API_DOMAIN => 'api_domain', 180 self::FRONTEND_DOMAIN => 'scriptjs_domain', 181 self::CPANEL_DOMAIN => 'cp_domain', 182 self::DEMO_STORE_ID => 'demo_store_id', 179 self::OAUTH_APPID => 'oauth_appid', 180 self::OAUTH_APPSECRET => 'oauth_appsecret', 181 self::TOKEN => 'oauth_token', 182 self::STORE_ID => 'store_id', 183 self::CHANNEL_ID => 'channel_id', 184 self::API_DOMAIN => 'api_domain', 185 self::STATIC_PAGES_API_DOMAIN => 'static_pages_api_domain', 186 self::FRONTEND_DOMAIN => 'scriptjs_domain', 187 self::CPANEL_DOMAIN => 'cp_domain', 188 self::DEMO_STORE_ID => 'demo_store_id', 183 189 ); 184 190 -
ecwid-shopping-cart/tags/6.12.18/includes/class-ecwid-products.php
r2825702 r3137594 97 97 98 98 $join .= 'LEFT JOIN ' . $wpdb->postmeta . ' ' . self::DB_ALIAS_OUT_OF_STOCK 99 . ' ON ' . $wpdb->posts . '.id = ' . self::DB_ALIAS_OUT_OF_STOCK . '.post_id'100 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_key="in_stock"'101 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_value=1';99 . ' ON ' . $wpdb->posts . '.id = ' . self::DB_ALIAS_OUT_OF_STOCK . '.post_id' 100 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_key="in_stock"' 101 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_value=1'; 102 102 103 103 return $join; … … 326 326 327 327 if ( ! $settings || $settings['one_at_a_time'] && ! $did_something ) { 328 329 328 $did_something = $this->_process_products( $settings ); 330 329 } 331 330 332 331 if ( ! $settings || $settings['one_at_a_time'] && ! $did_something ) { 333 334 332 $this->_status->update_last_sync_time( time() ); 335 333 … … 411 409 412 410 while ( ! $over ) { 413 414 411 $this->_status_event( 415 412 array( … … 552 549 553 550 while ( ! $over ) { 554 555 551 $this->_status_event( 556 552 array( -
ecwid-shopping-cart/tags/6.12.18/includes/class-ecwid-seo-links.php
r3116030 r3137594 339 339 340 340 $post = get_post( $page_id ); 341 341 342 if ( ! $post ) { 342 343 continue; 343 344 } 344 if ( ! in_array( $post->post_type, array( 'page', 'post' ) ) ) { 345 346 $default_post_types = array( 'page', 'post' ); 347 $allowed_post_types = apply_filters( 'ecwid_seo_allowed_post_types', $default_post_types ); 348 349 if ( ! in_array( $post->post_type, $allowed_post_types ) ) { 345 350 continue; 346 351 } … … 359 364 360 365 foreach ( $patterns as $pattern ) { 361 $additional_rules[ $link . '/' . $pattern . '.*' ] = 'index.php?' . $param_name . '=' . $link_page_id; 366 $query = 'index.php?' . $param_name . '=' . $link_page_id; 367 368 // adding post_type parameters for non-default types 369 if ( ! in_array( $post->post_type, $default_post_types ) ) { 370 $query .= '&post_type=' . $post->post_type; 371 } 372 373 $additional_rules[ $link . '/' . $pattern . '.*' ] = $query; 362 374 } 363 } 375 }//end foreach 364 376 }//end foreach 365 377 -
ecwid-shopping-cart/tags/6.12.18/includes/class-ecwid-static-page.php
r3116030 r3137594 10 10 11 11 const HANDLE_STATIC_PAGE = 'static-page'; 12 const API_URL = 'https://storefront.ecwid.com/';13 12 14 13 protected static $cache_key; … … 69 68 } 70 69 71 $url = self::API_URL;70 $url = 'https://' . Ecwid_Config::get_static_pages_api_domain() . '/'; 72 71 $url .= sprintf( '%s-page/', $params['mode'] ); 73 72 $url .= sprintf( '%s/', get_ecwid_store_id() ); -
ecwid-shopping-cart/tags/6.12.18/includes/shortcodes/class-ecwid-shortcode-productbrowser.php
r3110860 r3137594 59 59 } 60 60 61 $code .= self::get_dynamic_html_code( $is_default_render, $classname ); 62 61 63 $code .= '<div id="static-ec-store-container">'; 62 64 $code .= htmlspecialchars_decode( Ecwid_Static_Page::get_html_code() ); … … 67 69 } 68 70 $code .= '</div>'; 69 70 $code .= self::get_dynamic_html_code( $is_default_render, $classname );71 71 72 72 $force_dynamic_js_code = 'if( typeof window.ec.storefront.staticPages != "undefined" && typeof window.ec.storefront.staticPages.forceDynamicLoadingIfRequired != "undefined" ) { -
ecwid-shopping-cart/tags/6.12.18/readme.txt
r3131402 r3137594 6 6 Requires at least: 4.4 7 7 Tested up to: 6.6 8 Stable tag: 6.12.1 78 Stable tag: 6.12.18 9 9 10 10 Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available. … … 154 154 155 155 == Changelog == 156 = 6.12.18 - Aug 19, 2024 = 157 - Improved compatibility with pages created using the Jetpack plugin. Now ecommerce blocks added to Portfolio and Testimonial pages work as well as on regular pages. 158 - Fixed an issue with product option fields working on product pages. In some cases, product options were not clickable. We've fixed this. 159 156 160 = 6.12.17 - Aug 5, 2024 = 157 161 - Internal improvements and optimizations. -
ecwid-shopping-cart/trunk/css/frontend.css
r2825702 r3137594 105 105 content: ''; 106 106 } 107 108 #dynamic-ec-store-container, 109 #static-ec-store-container { 110 margin-top: 0 !important; 111 } -
ecwid-shopping-cart/trunk/ecwid-shopping-cart.php
r3131402 r3137594 6 6 Text Domain: ecwid-shopping-cart 7 7 Author: Ecwid Ecommerce 8 Version: 6.12.1 78 Version: 6.12.18 9 9 Author URI: https://ecwid.to/ecwid-site 10 10 License: GPLv2 or later … … 210 210 'sg-cachepress/sg-cachepress.php' => 'sg-optimizer', 211 211 'google-sitemap-generator/sitemap.php' => 'google-sitemap-generator', 212 'jetpack/jetpack.php' => 'jetpack', 212 213 ); 213 214 -
ecwid-shopping-cart/trunk/includes/class-ecwid-config.php
r3093942 r3137594 2 2 3 3 class Ecwid_Config { 4 const IS_WL = 'whitelabel_is_enabled'; 5 const BRAND = 'whitelabel_brand'; 6 const KB_URL = 'whitelabel_kb_url'; 7 const CONTACT_US_URL = 'whitelabel_contact_us_url'; 8 const REGISTRATION_URL = 'whitelabel_registration_url'; 9 const CHANNEL_ID = 'whitelabel_channel_id'; 10 const OAUTH_APPID = 'whitelabel_oauth_appid'; 11 const OAUTH_APPSECRET = 'whitelabel_oauth_appsecret'; 12 const OAUTH_TOKEN_URL = 'whitelabel_oauth_token_url'; 13 const OAUTH_AUTH_URL = 'whitelabel_oauth_auth_url'; 14 const TOKEN = 'config_token'; 15 const STORE_ID = 'config_store_id'; 16 const API_DOMAIN = 'config_api_domain'; 17 const FRONTEND_DOMAIN = 'config_frontend_domain'; 18 const CPANEL_DOMAIN = 'config_cpanel_domain'; 19 const DEMO_STORE_ID = 'config_demo_store_id'; 4 const IS_WL = 'whitelabel_is_enabled'; 5 const BRAND = 'whitelabel_brand'; 6 const KB_URL = 'whitelabel_kb_url'; 7 const CONTACT_US_URL = 'whitelabel_contact_us_url'; 8 const REGISTRATION_URL = 'whitelabel_registration_url'; 9 const CHANNEL_ID = 'whitelabel_channel_id'; 10 const OAUTH_APPID = 'whitelabel_oauth_appid'; 11 const OAUTH_APPSECRET = 'whitelabel_oauth_appsecret'; 12 const OAUTH_TOKEN_URL = 'whitelabel_oauth_token_url'; 13 const OAUTH_AUTH_URL = 'whitelabel_oauth_auth_url'; 14 const TOKEN = 'config_token'; 15 const STORE_ID = 'config_store_id'; 16 const API_DOMAIN = 'config_api_domain'; 17 const STATIC_PAGES_API_DOMAIN = 'config_static_pages_api_domain'; 18 const FRONTEND_DOMAIN = 'config_frontend_domain'; 19 const CPANEL_DOMAIN = 'config_cpanel_domain'; 20 const DEMO_STORE_ID = 'config_demo_store_id'; 20 21 21 22 public static function is_wl() { … … 85 86 public static function get_api_domain() { 86 87 return EcwidPlatform::get( self::API_DOMAIN, 'app.ecwid.com' ); 88 } 89 90 public static function get_static_pages_api_domain() { 91 return EcwidPlatform::get( self::STATIC_PAGES_API_DOMAIN, 'storefront.ecwid.com' ); 87 92 } 88 93 … … 172 177 protected static function _get_common_config() { 173 178 $common_config = array( 174 self::OAUTH_APPID => 'oauth_appid', 175 self::OAUTH_APPSECRET => 'oauth_appsecret', 176 self::TOKEN => 'oauth_token', 177 self::STORE_ID => 'store_id', 178 self::CHANNEL_ID => 'channel_id', 179 self::API_DOMAIN => 'api_domain', 180 self::FRONTEND_DOMAIN => 'scriptjs_domain', 181 self::CPANEL_DOMAIN => 'cp_domain', 182 self::DEMO_STORE_ID => 'demo_store_id', 179 self::OAUTH_APPID => 'oauth_appid', 180 self::OAUTH_APPSECRET => 'oauth_appsecret', 181 self::TOKEN => 'oauth_token', 182 self::STORE_ID => 'store_id', 183 self::CHANNEL_ID => 'channel_id', 184 self::API_DOMAIN => 'api_domain', 185 self::STATIC_PAGES_API_DOMAIN => 'static_pages_api_domain', 186 self::FRONTEND_DOMAIN => 'scriptjs_domain', 187 self::CPANEL_DOMAIN => 'cp_domain', 188 self::DEMO_STORE_ID => 'demo_store_id', 183 189 ); 184 190 -
ecwid-shopping-cart/trunk/includes/class-ecwid-products.php
r2825702 r3137594 97 97 98 98 $join .= 'LEFT JOIN ' . $wpdb->postmeta . ' ' . self::DB_ALIAS_OUT_OF_STOCK 99 . ' ON ' . $wpdb->posts . '.id = ' . self::DB_ALIAS_OUT_OF_STOCK . '.post_id'100 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_key="in_stock"'101 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_value=1';99 . ' ON ' . $wpdb->posts . '.id = ' . self::DB_ALIAS_OUT_OF_STOCK . '.post_id' 100 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_key="in_stock"' 101 . ' AND ' . self::DB_ALIAS_OUT_OF_STOCK . '.meta_value=1'; 102 102 103 103 return $join; … … 326 326 327 327 if ( ! $settings || $settings['one_at_a_time'] && ! $did_something ) { 328 329 328 $did_something = $this->_process_products( $settings ); 330 329 } 331 330 332 331 if ( ! $settings || $settings['one_at_a_time'] && ! $did_something ) { 333 334 332 $this->_status->update_last_sync_time( time() ); 335 333 … … 411 409 412 410 while ( ! $over ) { 413 414 411 $this->_status_event( 415 412 array( … … 552 549 553 550 while ( ! $over ) { 554 555 551 $this->_status_event( 556 552 array( -
ecwid-shopping-cart/trunk/includes/class-ecwid-seo-links.php
r3116030 r3137594 339 339 340 340 $post = get_post( $page_id ); 341 341 342 if ( ! $post ) { 342 343 continue; 343 344 } 344 if ( ! in_array( $post->post_type, array( 'page', 'post' ) ) ) { 345 346 $default_post_types = array( 'page', 'post' ); 347 $allowed_post_types = apply_filters( 'ecwid_seo_allowed_post_types', $default_post_types ); 348 349 if ( ! in_array( $post->post_type, $allowed_post_types ) ) { 345 350 continue; 346 351 } … … 359 364 360 365 foreach ( $patterns as $pattern ) { 361 $additional_rules[ $link . '/' . $pattern . '.*' ] = 'index.php?' . $param_name . '=' . $link_page_id; 366 $query = 'index.php?' . $param_name . '=' . $link_page_id; 367 368 // adding post_type parameters for non-default types 369 if ( ! in_array( $post->post_type, $default_post_types ) ) { 370 $query .= '&post_type=' . $post->post_type; 371 } 372 373 $additional_rules[ $link . '/' . $pattern . '.*' ] = $query; 362 374 } 363 } 375 }//end foreach 364 376 }//end foreach 365 377 -
ecwid-shopping-cart/trunk/includes/class-ecwid-static-page.php
r3116030 r3137594 10 10 11 11 const HANDLE_STATIC_PAGE = 'static-page'; 12 const API_URL = 'https://storefront.ecwid.com/';13 12 14 13 protected static $cache_key; … … 69 68 } 70 69 71 $url = self::API_URL;70 $url = 'https://' . Ecwid_Config::get_static_pages_api_domain() . '/'; 72 71 $url .= sprintf( '%s-page/', $params['mode'] ); 73 72 $url .= sprintf( '%s/', get_ecwid_store_id() ); -
ecwid-shopping-cart/trunk/includes/shortcodes/class-ecwid-shortcode-productbrowser.php
r3110860 r3137594 59 59 } 60 60 61 $code .= self::get_dynamic_html_code( $is_default_render, $classname ); 62 61 63 $code .= '<div id="static-ec-store-container">'; 62 64 $code .= htmlspecialchars_decode( Ecwid_Static_Page::get_html_code() ); … … 67 69 } 68 70 $code .= '</div>'; 69 70 $code .= self::get_dynamic_html_code( $is_default_render, $classname );71 71 72 72 $force_dynamic_js_code = 'if( typeof window.ec.storefront.staticPages != "undefined" && typeof window.ec.storefront.staticPages.forceDynamicLoadingIfRequired != "undefined" ) { -
ecwid-shopping-cart/trunk/readme.txt
r3131402 r3137594 6 6 Requires at least: 4.4 7 7 Tested up to: 6.6 8 Stable tag: 6.12.1 78 Stable tag: 6.12.18 9 9 10 10 Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available. … … 154 154 155 155 == Changelog == 156 = 6.12.18 - Aug 19, 2024 = 157 - Improved compatibility with pages created using the Jetpack plugin. Now ecommerce blocks added to Portfolio and Testimonial pages work as well as on regular pages. 158 - Fixed an issue with product option fields working on product pages. In some cases, product options were not clickable. We've fixed this. 159 156 160 = 6.12.17 - Aug 5, 2024 = 157 161 - Internal improvements and optimizations.
Note: See TracChangeset
for help on using the changeset viewer.