Merge pull request #293 from moderntribe/release/4.14.1

becomevocal · web-flow · commit c576b79ceb21 · 2021-07-23T17:28:05.000-04:00
packaged version 4.14.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+
+## [4.14.1]
+
+### Fixed
+- Fixed the product template include logic for WordPress 5.8
+- Fixed bug introduced in WordPress 5.8 that prevents WordPress Customizer from reacting when changes were made to the Product Catalog "Sort By" options.
+- Updates add to cart functionality to wait for creation of cart, so multiple add to carts function properly.  Fix for: https://github.com/bigcommerce/bigcommerce-for-wordpress/issues/230
+
 ## [4.14.0]
 
 ### Fixed
@@ -1454,6 +1462,7 @@
   in fact, reset postdata, so far as Gutenberg 3.2.0 is concerned.
 
 
+[4.14.1]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/4.14.0...4.14.1
 [4.14.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/4.13.0...4.14.0
 [4.13.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/4.12.0...4.13.0
 [4.12.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/4.11.0...4.12.0
diff --git a/assets/js/dist/admin/scripts.js b/assets/js/dist/admin/scripts.js
diff --git a/assets/js/dist/admin/scripts.min.js b/assets/js/dist/admin/scripts.min.js
diff --git a/assets/js/dist/scripts.js b/assets/js/dist/scripts.js
diff --git a/assets/js/dist/scripts.min.js b/assets/js/dist/scripts.min.js
diff --git a/assets/js/src/admin/customizer/index.js b/assets/js/src/admin/customizer/index.js
@@ -6,16 +6,15 @@
 import multiCheckboxes from './multiple-checkboxes';
 import * as tools from '../../utils/tools';
 
-const el = {
-	customizer: tools.getNodes('#customize-controls', false, document, true)[0],
-};
-
 const init = () => {
-	if (!el.customizer) {
+	/** Note: make sure to look for element after "DOM ready" */
+	const customizer = tools.getNodes('#customize-controls', false, document, true)[0];
+
+	if (!customizer) {
 		return;
 	}
 
-	multiCheckboxes(el.customizer);
+	multiCheckboxes(customizer);
 
 	console.info('BigCommerce: Initialized Theme Customizer Scripts.');
 };
diff --git a/assets/js/src/public/cart/add-to-cart.js b/assets/js/src/public/cart/add-to-cart.js
@@ -169,6 +169,8 @@ const createAjaxResponseMessage = (wrapper = '', message = '', error = false) =>
  */
 const handleFetchingState = (button = '') => {
 	if (!button) {
+		const allCartButtons = tools.getNodes('.bc-btn--add_to_cart', true, document, true);
+		allCartButtons.forEach(handleFetchingState);
 		return;
 	}
 
@@ -228,12 +230,12 @@ const handleAjaxAddToCartRequest = (e) => {
 	const url = cartID ? `${CART_API_BASE}/${cartID}` : CART_API_BASE;
 	const query = getAjaxQueryString(cartButton);
 
-	handleFetchingState(cartButton);
+	handleFetchingState(cartID ? cartButton : null);
 	wpAPIAddToCartAjax(url, query)
 		.set('X-WP-Nonce', AJAX_CART_NONCE)
 		.end((err, res) => {
 			state.isFetching = false;
-			handleFetchingState(cartButton);
+			handleFetchingState(cartID ? cartButton : null);
 
 			if (err) {
 				console.error(err);
diff --git a/bigcommerce.php b/bigcommerce.php
@@ -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:      4.14.0
+Version:      4.14.1
 Author URI:   https://www.bigcommerce.com/wordpress
 Requires PHP: 7.2.0
 Text Domain:  bigcommerce
diff --git a/build-timestamp.php b/build-timestamp.php
@@ -1,2 +1,2 @@
 <?php
-define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '6.02.07.02.2021');
+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '7.13.07.23.2021');
diff --git a/readme.txt b/readme.txt
@@ -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: 5.2
 Tested up to: 5.5
-Stable tag: 4.14.0
+Stable tag: 4.14.1
 Requires PHP: 7.2.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
diff --git a/src/BigCommerce/Container/Editor.php b/src/BigCommerce/Container/Editor.php
@@ -50,6 +50,12 @@ private function render_dialog_template( Container $container ) {
 			echo $container[ self::UI_DIALOG ]->render_dialog_once();
 		} );
 		add_action( 'enqueue_block_editor_assets', $this->create_callback( 'block_editor_enqueue_dialog_template', function() use ( $container, $render_callback ) {
+			$current_screen = get_current_screen();
+			
+			if ( is_a( $current_screen, 'WP_Screen' ) && method_exists( $current_screen, 'is_block_editor' ) && ! $current_screen->is_block_editor() ) {
+				return;
+			}
+
 			if ( did_action( 'admin_enqueue_scripts' ) ) { // if the Gutenberg plugin is enabled, the action will already be called
 				$render_callback();
 			} else { // if using the Block Editor in WP core, no HTML has been rendered, so delay the output
diff --git a/src/BigCommerce/Container/Templates.php b/src/BigCommerce/Container/Templates.php
@@ -86,7 +86,7 @@ public function register( Container $container ) {
 
 
 		add_filter( 'template_include', $this->create_callback( 'template_include', function ( $path ) use ( $container ) {
-			return $container[ self::OVERRIDE ]->fallback_to_plugin_template( $path );
+			return $container[ self::OVERRIDE ]->include_product_template( $path );
 		} ), 10, 1 );
 
 		add_filter( 'body_class', $this->create_callback( 'set_body_classes', function ( $classes ) use ( $container ) {
diff --git a/src/BigCommerce/Forms/Update_Profile_Handler.php b/src/BigCommerce/Forms/Update_Profile_Handler.php
@@ -39,14 +39,15 @@ public function handle_request( $submission ) {
 			$update_user      = true;
 		}
 
+		$userdata = $user->to_array();
 		if ( $password ) {
-			$user->user_pass                            = $password;
+			$userdata['user_pass']                      = $password;
 			$update_user                                = true;
 			$profile[ '_authentication' ][ 'password' ] = $password;
 		}
 
 		if ( $update_user ) {
-			$updated = wp_update_user( $user );
+			$updated = wp_update_user( $userdata );
 			if ( is_wp_error( $updated ) ) {
 				switch ( $updated->get_error_code() ) {
 					case 'existing_user_email':
diff --git a/src/BigCommerce/Plugin.php b/src/BigCommerce/Plugin.php
@@ -4,7 +4,7 @@
 namespace BigCommerce;
 
 class Plugin {
-	const VERSION = '4.14.0';
+	const VERSION = '4.14.1';
 
 	protected static $_instance;
 
diff --git a/src/BigCommerce/Templates/Template_Override.php b/src/BigCommerce/Templates/Template_Override.php
@@ -173,10 +173,7 @@ private function prefix_theme_paths( $paths ) {
 	 *
 	 * @filter template_include
 	 */
-	public function fallback_to_plugin_template( $template ) {
-		if ( ! empty( $template ) ) {
-			return $template;
-		}
+	public function include_product_template( $template ) {
 		if ( is_singular( Product::NAME ) ) {
 			return $this->get_product_single_path();
 		}
@@ -194,29 +191,40 @@ public function fallback_to_plugin_template( $template ) {
 	 * @return bool|string Path to the product single template in the plugin
 	 */
 	private function get_product_single_path() {
-		return $this->get_plugin_template_path( 'single-' . Product::NAME . '.php' );
+		return $this->get_template_path( 'single-' . Product::NAME . '.php' );
 	}
 
 	/**
 	 * @return bool|string Path to the product archive template in the plugin
 	 */
 	private function get_product_archive_path() {
-		return $this->get_plugin_template_path( 'archive-' . Product::NAME . '.php' );
+		return $this->get_template_path( 'archive-' . Product::NAME . '.php' );
 	}
 
 	/**
-	 * Get the relative path to a template file in the plugin dir
+	 * Get the template path
 	 *
 	 * @param string $relative_path
 	 *
 	 * @return string|bool
 	 */
-	private function get_plugin_template_path( $relative_path ) {
+	private function get_template_path( $relative_path ) {
+		$path = '';
+		/**
+		 * This filter is documented in src/BigCommerce/Templates/Controller.php
+		 */
+		$theme_dir = apply_filters( 'bigcommerce/template/directory/theme', '', $relative_path );
+		if ( ! empty( $theme_dir ) ) {
+			$path = locate_template( trailingslashit( $theme_dir ) . $relative_path );
+		}
+
 		/**
 		 * This filter is documented in src/BigCommerce/Templates/Controller.php
 		 */
 		$plugin_dir = apply_filters( 'bigcommerce/template/directory/plugin', '', $relative_path );
-		$path       = trailingslashit( $plugin_dir ) . $relative_path;
+		if ( empty( $path ) && ! empty( $plugin_dir ) ) {
+			$path = trailingslashit( $plugin_dir ) . $relative_path;
+		}
 
 		$path = apply_filters( 'bigcommerce/template/path', $path, $relative_path );
 		if ( ! file_exists( $path ) ) {
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInite5b4371c88b91e72e12444df1b09e8b5::getLoader();
+return ComposerAutoloaderInit1d7523f38cde5af43ae26f4a81856102::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite5b4371c88b91e72e12444df1b09e8b5
+class ComposerAutoloaderInit1d7523f38cde5af43ae26f4a81856102
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInite5b4371c88b91e72e12444df1b09e8b5', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit1d7523f38cde5af43ae26f4a81856102', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInite5b4371c88b91e72e12444df1b09e8b5', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit1d7523f38cde5af43ae26f4a81856102', '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\ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit1d7523f38cde5af43ae26f4a81856102::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\ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit1d7523f38cde5af43ae26f4a81856102::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiree5b4371c88b91e72e12444df1b09e8b5($fileIdentifier, $file);
+            composerRequire1d7523f38cde5af43ae26f4a81856102($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequiree5b4371c88b91e72e12444df1b09e8b5($fileIdentifier, $file)
+function composerRequire1d7523f38cde5af43ae26f4a81856102($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5
+class ComposerStaticInit1d7523f38cde5af43ae26f4a81856102
 {
     public static $files = array (
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
@@ -1114,10 +1114,10 @@ class ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInite5b4371c88b91e72e12444df1b09e8b5::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit1d7523f38cde5af43ae26f4a81856102::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit1d7523f38cde5af43ae26f4a81856102::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit1d7523f38cde5af43ae26f4a81856102::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit1d7523f38cde5af43ae26f4a81856102::$classMap;
 
         }, null, ClassLoader::class);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?php`
`2`		`-define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '6.02.07.02.2021');`
	`2`	`+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '7.13.07.23.2021');`