Merge pull request #216 from moderntribe/release/3.21.0

packaged version 3.21.0

Author: becomevocal

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.21.0]
+
+### Added
+- Added manuall site URL sync option in the Diagnostics panel
+
+### Changed
+- Modified admin import timeout message
+- Update checkout SDK to 1.79.0
+
+### Fixed
+- Fixed Best Selling sort on Product archive page
+- Fixed category sort not being reflected in the menu
+
+
 ## [3.20.0]
 
 ### Changed
@@ -1193,6 +1207,7 @@
   in fact, reset postdata, so far as Gutenberg 3.2.0 is concerned.
 
 
+[3.21.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.20.0...3.21.0
 [3.20.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.19.0...3.20.0
 [3.19.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.18.1...3.19.0
 [3.18.1]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.18.0...3.18.1

assets/js/dist/scripts.js

@@ -5,7 +5,6 @@
 
 import Cookie from 'js-cookie';
 import _ from 'lodash';
-import { embedCheckout } from '@bigcommerce/checkout-sdk';
 import * as tools from 'utils/tools';
 import scrollTo from 'utils/dom/scroll-to';
 import { CART_ID_COOKIE_NAME, CART_ITEM_COUNT_COOKIE } from 'bcConstants/cookies';
@@ -56,7 +55,8 @@ const scrollIframe = () => {
  * @function loadEmbeddedCheckout
  * @description Create an instance of the BC embedded checkout.
  */
-const loadEmbeddedCheckout = () => {
+const loadEmbeddedCheckout = async () => {
+	const checkoutCDN = await checkoutKitLoader.load('embedded-checkout');
 	// Load the config from the data attribute of the checkout container.
 	const config = JSON.parse(el.container.dataset.config);
 
@@ -71,7 +71,7 @@ const loadEmbeddedCheckout = () => {
 	config.onComplete = scrollIframe;
 
 	// Embed the checkout.
-	embedCheckout(config);
+	checkoutCDN.embedCheckout(config);
 };
 
 const init = () => {

assets/js/dist/scripts.min.js

@@ -3,7 +3,7 @@
 Plugin Name:  BigCommerce for WordPress
 Description:  Scale your ecommerce business with WordPress on the front-end and BigCommerce on the back end. Free up server resources from things like catalog management, processing payments, and managing fulfillment logistics.
 Author:       BigCommerce
-Version:      3.20.0
+Version:      3.21.0
 Author URI:   https://www.bigcommerce.com/wordpress
 Requires PHP: 5.6.24
 Text Domain:  bigcommerce

assets/js/dist/vendor.js

@@ -1,2 +1,2 @@
 <?php
-define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '4.30.06.05.2020');
+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '3.04.07.03.2020');

assets/js/dist/vendor.min.js

@@ -3,7 +3,7 @@ Contributors: bigcommerce, moderntribe, jbrinley, becomevocal, vincentlistrani,
 Tags: ecommerce, online store, sell online, storefront, retail, online shop, bigcommerce, big commerce, e-commerce, physical products, buy buttons, commerce, shopping cart, checkout, cart, shop, headless commerce, shipping, payments, fulfillment
 Requires at least: 4.6
 Tested up to: 5.3
-Stable tag: 3.20.0
+Stable tag: 3.21.0
 Requires PHP: 5.6.24
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

assets/js/src/public/checkout/embedded-checkout.js

@@ -37,7 +37,7 @@ public function get_data() {
 				'sync'                                   => [
 					'success'      => __( 'Products Successfully Synced', 'bigcommerce' ),
 					'error'        => __( 'There was an error syncing your products. Please try to import again. If the error persists, please contact support.', 'bigcommerce' ),
-					'timeout'      => __( 'The server is taking longer than expected to respond. We’ll keep trying, but it may take a few minutes to get things moving again. If the problem persists, try reducing the batch size in the Product Sync settings panel.', 'bigcommerce' ),
+					'timeout'      => __( "The server is taking longer than expected to respond. We’ll keep trying, so don't worry. If the problem persists, try reducing the batch size in the Product Sync settings panel.", 'bigcommerce' ),
 					'server_error' => __( 'The server sent an unexpected response. We’ll keep trying, but it may take a few minutes to get things moving again. If the problem persists, try turning on error logging in the Diagnostics settings panel.', 'bigcommerce' ),
 					'unauthorized' => __( 'An error occurred while validating your request. Please refresh the page and try again.', 'bigcommerce' ),
 				],

bigcommerce.php

@@ -4,6 +4,8 @@
 namespace BigCommerce\Assets\Theme;
 
 
+use BigCommerce\Pages\Checkout_Page;
+
 class Scripts {
 	/**
 	 * @var string Path to the plugin assets directory
@@ -48,6 +50,10 @@ public function enqueue_scripts() {
 		$vendor_src   = $this->directory . 'js/dist/' . $vendor_scripts;
 		$plugin_src   = $this->directory . 'js/dist/' . $plugin_scripts;
 
+		if ( is_page( get_option( Checkout_Page::NAME, 0 ) ) ) {
+			wp_enqueue_script( 'bigcommerce-checkout-sdk', 'https://checkout-sdk.bigcommerce.com/v1/loader.js', [], $this->version, true );
+		}
+
 		wp_register_script( 'bigcommerce-manifest', $manifest_src, [], $this->version, true );
 		wp_register_script( 'bigcommerce-vendors', $vendor_src, [ 'bigcommerce-manifest', 'jquery' ], $this->version, true );
 		wp_register_script( 'bigcommerce-scripts', $plugin_src, [ 'bigcommerce-vendors' ], $this->version, true );
@@ -57,4 +63,4 @@ public function enqueue_scripts() {
 
 		wp_enqueue_script( 'bigcommerce-scripts' );
 	}
-}
+}

build-timestamp.php

@@ -38,6 +38,7 @@
 use BigCommerce\Settings\Sections\Reviews;
 use BigCommerce\Settings\Sections\Troubleshooting_Diagnostics;
 use BigCommerce\Settings\Site_Update;
+use BigCommerce\Settings\Site_URL_Sync;
 use BigCommerce\Settings\Start_Over;
 use BigCommerce\Taxonomies\Channel\Channel;
 use Pimple\Container;
@@ -77,6 +78,7 @@ class Settings extends Provider {
 	const IMPORT_LIVE_STATUS  = 'settings.import_status_live';
 	const START_OVER          = 'settings.start_over';
 	const ONBOARDING_PROGRESS = 'settings.onboarding.progress_bar';
+	const SITE_URL_SYNC       = 'settings.site_url_sync';
 
 	const CONFIG_STATUS              = 'settings.configuration_status';
 	const CONFIG_DISPLAY_MENUS       = 'settings.configuration_display_menus';
@@ -629,6 +631,10 @@ private function diagnostics( Container $container ) {
 			$plugin_path = plugin_dir_path( $container['plugin_file'] );
 			return new Troubleshooting_Diagnostics( $plugin_path );
 		};
+		
+		$container[ self::SITE_URL_SYNC ] = function ( Container $container ) {
+			return new Site_URL_Sync( $container[ Taxonomies::ROUTES ] , $container[ self::SETTINGS_SCREEN ] );
+		};
 
 		add_action( 'bigcommerce/settings/register/screen=' . Settings_Screen::NAME, $this->create_callback( 'diagnostics_settings_register', function () use ( $container ) {
 			$container[ self::DIAGNOSTICS_SECTION ]->register_settings_section();
@@ -641,7 +647,10 @@ private function diagnostics( Container $container ) {
 		add_action( 'wp_ajax_' . Troubleshooting_Diagnostics::AJAX_ACTION_IMPORT_ERRORS, $this->create_callback( 'diagnostics_settings_import_errors_action', function () use ( $container ) {
 			$container[ self::DIAGNOSTICS_SECTION ]->get_import_errors( $container[ Log::LOGGER ] );
 		} ), 10, 0 );
-
+		
+		add_action( 'admin_post_' . Troubleshooting_Diagnostics::SYNC_SITE_URL, $this->create_callback( 'diagnostics_settings_sync_site_url_action', function () use ( $container ) {
+			$container[ self::SITE_URL_SYNC ]->sync();
+		} ), 10, 0 );
 	}
 
 	private function resources( Container $container ) {

readme.txt

@@ -3,7 +3,7 @@
 namespace BigCommerce\Import;
 
 interface Import_Strategy {
-	const VERSION = '3.19.0';
+	const VERSION = '3.21.0';
 
 	/**
 	 * @return int The imported post ID

src/BigCommerce/Assets/Admin/JS_Localization.php

@@ -24,6 +24,7 @@ protected function save_wp_term( \ArrayAccess $bc_term ) {
 
 	protected function save_wp_termmeta( \ArrayAccess $bc_term ) {
 		update_term_meta( $this->term_id, 'bigcommerce_id', $bc_term[ 'id' ] );
+		update_term_meta( $this->term_id, 'sort_order', $bc_term[ 'sort_order' ] );
 	}
 
 }

src/BigCommerce/Assets/Theme/Scripts.php

@@ -76,7 +76,7 @@ public function ajax_continue_import() {
 			// cron can continue to run if the user leaves the page and the Ajax
 			// requests stop coming.
 		} catch ( \Exception $e ) {
-			$message = __( 'The server sent an unexpected response. We’ll keep trying, but it may take a few minutes to get things moving again. If the problem persists, try turning on error logging in the Diagnostics settings panel.', 'bigcommerce' );
+			$message = __( 'The server sent an unexpected response. We’ll keep trying, so dont’t worry. If the problem persists, try turning on error logging in the Diagnostics settings panel.', 'bigcommerce' );
 			if ( WP_DEBUG && $e->getMessage() ) {
 				$message .= ' ' . sprintf( __( 'Error message: %s', 'bigcommerce' ), $e->getMessage() );
 			}

src/BigCommerce/Container/Settings.php

@@ -72,11 +72,17 @@ private function get_menu_item_children( $item ) {
 		}
 		$terms = get_terms( [
 			'taxonomy'     => $taxonomy->name,
-			'orderby'      => 'name',
-			'order'        => 'ASC',
 			'hide_empty'   => true,
 			'hierarchical' => true,
 			'parent'       => 0,
+			'meta_query' => [
+				[
+					'key'  => 'sort_order',
+					'type' => 'NUMERIC',
+				]
+			],
+			'orderby' => 'sort_order',
+			'order'   => 'ASC',
 		] );
 		$index = 1;
 		$items = array_map( function ( $term ) use ( $item, &$index ) {

src/BigCommerce/Import/Import_Strategy.php

@@ -4,7 +4,7 @@
 namespace BigCommerce;
 
 class Plugin {
-	const VERSION = '3.20.0';
+	const VERSION = '3.21.0';
 
 	protected static $_instance;
 

src/BigCommerce/Import/Importers/Terms/Term_Updater.php

@@ -56,7 +56,7 @@ public function filter_queries( \WP_Query $query ) {
 					break;
 				case Product_Archive::SORT_FEATURED:
 					// Product 'featured' tag in BC store has no effect on sorting
-					$query->set( 'orderby', [ 'menu_order' => 'ASC', 'title' => 'ASC', 'date' => 'DESC' ] );
+					$query->set( 'orderby', [ 'menu_order' => 'ASC', 'date' => 'DESC', 'title' => 'ASC' ] );
 					break;
 				case Product_Archive::SORT_PRICE_ASC:
 					$meta_query = $query->get( 'meta_query' ) ?: [];
@@ -96,9 +96,16 @@ public function filter_queries( \WP_Query $query ) {
 					$meta_query['bigcommerce_sales'] = [
 						'key'     => Product::SALES_META_KEY,
 						'compare' => 'EXISTS',
+						'type'    => 'NUMERIC'
 					];
+					
+					$meta_query['bigcommerce_id'] = [
+						'key'  => Product::BIGCOMMERCE_ID,
+						'type' => 'NUMERIC'
+					];
+
 					$query->set( 'meta_query', $meta_query );
-					$query->set( 'orderby', [ 'bigcommerce_sales' => 'DESC', 'title' => 'ASC' ] );
+					$query->set( 'orderby', [ 'bigcommerce_sales' => 'DESC', 'bigcommerce_id' => 'DESC' ] );
 					break;
 				case 'bigcommerce_id__in':
 					$meta_query                   = $query->get( 'meta_query' ) ?: [];

src/BigCommerce/Import/Runner/Cron_Runner.php

@@ -27,6 +27,7 @@ class Troubleshooting_Diagnostics extends Settings_Section {
 	const DIAGNOSTICS_NAME = 'bigcommerce_diagnostics_name';
 	const TEXTBOX_NAME     = 'bigcommerce_diagnostics_output';
 	const LOG_ERRORS       = 'bigcommerce_diagnostics_log_import_errors';
+	const SYNC_SITE_URL    = 'bigcommerce_diagnostics_sync_site_url';
 
 	const AJAX_ACTION               = 'bigcommerce_support_data';
 	const AJAX_ACTION_IMPORT_ERRORS = 'bigcommerce_import_errors_log';
@@ -55,11 +56,25 @@ public function register_settings_section() {
 			Settings_Screen::NAME
 		);
 
+		add_settings_field(
+			self::SYNC_SITE_URL,
+			esc_html( __( 'Sync Site URL', 'bigcommerce' ) ),
+			[ $this, 'render_sync_site_url', ],
+			Settings_Screen::NAME,
+			self::NAME,
+			[
+				'type'        => 'checkbox',
+				'option'      => self::SYNC_SITE_URL,
+				'label'       => __( 'Sync Site URL', 'bigcommerce' ),
+				'description' => __( 'Manually sync site URL with BigCommerce.', 'bigcommerce' ),
+			]
+		);
+
 		register_setting(
 			Settings_Screen::NAME,
 			self::LOG_ERRORS
 		);
-
+		
 		add_settings_field(
 			self::LOG_ERRORS,
 			esc_html( __( 'Log import errors', 'bigcommerce' ) ),
@@ -91,6 +106,12 @@ public function register_settings_section() {
 
 	}
 
+	public function render_sync_site_url( $args ) {
+		$url  = add_query_arg( [ 'action' => self::SYNC_SITE_URL, '_wpnonce' => wp_create_nonce( self::SYNC_SITE_URL ) ], admin_url( 'admin-post.php' ) );
+		$link = sprintf( '<a href="%s" class="bc-admin-btn">%s</a>', esc_url( $url ), esc_attr( $args[ 'label' ] ) );
+		printf( '%s<p class="description">%s</p>', $link, esc_html__( $args[ 'description' ], 'bigcommerce' ) );
+	}
+
 	/**
 	 * @param array $args
 	 */

src/BigCommerce/Nav_Menu/Dynamic_Menu_Items.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace BigCommerce\Settings;
+
+
+class Site_URL_Sync {
+
+    protected $routes;
+    protected $screen_settings;
+
+    public function __construct( $routes, $screen_settings ) {
+        $this->routes          = $routes;
+        $this->screen_settings = $screen_settings;
+    }
+
+    public function sync() {
+        $submission = filter_var_array( $_GET, [
+            '_wpnonce' => FILTER_SANITIZE_STRING,
+        ] );
+        
+        if ( empty( $submission['_wpnonce'] ) || ! wp_verify_nonce( $submission['_wpnonce'], Sections\Troubleshooting_Diagnostics::SYNC_SITE_URL ) ) {
+            throw new \InvalidArgumentException( __( 'Invalid request. Please try again.', 'bigcommerce' ), 403 );
+        }
+
+        $this->routes->update_site_home();
+
+        wp_safe_redirect( esc_url_raw( $this->screen_settings->get_url() ), 303 );
+        exit();
+    }
+}

src/BigCommerce/Plugin.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4::getLoader();
+return ComposerAutoloaderInit78ffef7991759664bfd69220bf9a5197::getLoader();

src/BigCommerce/Post_Types/Product/Query.php

@@ -599,6 +599,7 @@
     'BigCommerce\\Settings\\Sections\\Webhooks' => $baseDir . '/src/BigCommerce/Settings/Sections/Webhooks.php',
     'BigCommerce\\Settings\\Sections\\Wishlists' => $baseDir . '/src/BigCommerce/Settings/Sections/Wishlists.php',
     'BigCommerce\\Settings\\Sections\\WithPages' => $baseDir . '/src/BigCommerce/Settings/Sections/WithPages.php',
+    'BigCommerce\\Settings\\Site_URL_Sync' => $baseDir . '/src/BigCommerce/Settings/Site_URL_Sync.php',
     'BigCommerce\\Settings\\Start_Over' => $baseDir . '/src/BigCommerce/Settings/Start_Over.php',
     'BigCommerce\\Shortcodes\\Account_Profile' => $baseDir . '/src/BigCommerce/Shortcodes/Account_Profile.php',
     'BigCommerce\\Shortcodes\\Address_List' => $baseDir . '/src/BigCommerce/Shortcodes/Address_List.php',

src/BigCommerce/Settings/Sections/Troubleshooting_Diagnostics.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4
+class ComposerAutoloaderInit78ffef7991759664bfd69220bf9a5197
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit78ffef7991759664bfd69220bf9a5197', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit78ffef7991759664bfd69220bf9a5197', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit78ffef7991759664bfd69220bf9a5197::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -39,19 +39,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit78ffef7991759664bfd69220bf9a5197::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire39b28582cfaf12bb36d8163a54330ec4($fileIdentifier, $file);
+            composerRequire78ffef7991759664bfd69220bf9a5197($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire39b28582cfaf12bb36d8163a54330ec4($fileIdentifier, $file)
+function composerRequire78ffef7991759664bfd69220bf9a5197($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;