Merge pull request #214 from moderntribe/release/3.20.0

becomevocal · web-flow · commit 3a9f0675ffb2 · 2020-06-08T11:17:21.000-05:00
packaged version 3.20.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.20.0]
+
+### Changed
+- Link to BigCommerce HTTPS settings from Embedded Checkout settings tab.
+
+
+### Fixed
+
+- Fixed an issue with product grids where Ajax to cart is enabled but no simple products are on the page. This would 
+  cause the Add to Cart button on Quick View to redirect to the cart page instead of an ajax submission.
+
+- Fixed Google SiteKit plugin breaking Settings page.
+
+
 ## [3.19.0]
 
 ### Added
@@ -1179,6 +1193,7 @@
   in fact, reset postdata, so far as Gutenberg 3.2.0 is concerned.
 
 
+[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
 [3.18.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.17.0...3.18.0
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/public/cart/add-to-cart.js b/assets/js/src/public/cart/add-to-cart.js
@@ -25,10 +25,6 @@ const state = {
 	cartMessage: '',
 };
 
-const el = {
-	buttons: tools.getNodes('.bc-btn--add_to_cart', true, document, true),
-};
-
 /**
  * @function buildAjaxQueryString
  * @description Build a query string of all options and modifiers for a selected variant.
@@ -257,7 +253,7 @@ const bindEvents = () => {
 };
 
 const init = () => {
-	if (!state.ajax_enabled || el.buttons.length === 0) {
+	if (!state.ajax_enabled) {
 		return;
 	}
 
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:      3.19.0
+Version:      3.20.0
 Author URI:   https://www.bigcommerce.com/wordpress
 Requires PHP: 5.6.24
 Text Domain:  bigcommerce
diff --git a/build-timestamp.php b/build-timestamp.php
@@ -1,2 +1,2 @@
 <?php
-define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '4.12.05.15.2020');
+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '4.30.06.05.2020');
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: 4.6
 Tested up to: 5.3
-Stable tag: 3.19.0
+Stable tag: 3.20.0
 Requires PHP: 5.6.24
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
diff --git a/src/BigCommerce/Container/Assets.php b/src/BigCommerce/Container/Assets.php
@@ -63,6 +63,12 @@ public function admin( Container $container ) {
 			$container[ self::ADMIN_SCRIPTS ]->enqueue_scripts();
 			$container[ self::ADMIN_STYLES ]->enqueue_styles();
 		} ), 9, 0 );
+		
+		add_action( 'admin_enqueue_scripts', $this->create_callback( 'admin_remove_google_sitekit_script_on_bc_admin_pages', function ( $hook ) {
+			if ( strpos( get_current_screen()->id, 'bigcommerce') !== false ) {
+				wp_dequeue_script( 'googlesitekit-base' );
+			}
+		} ), 999 );
 	}
 
 	public function frontend( Container $container ) {
diff --git a/src/BigCommerce/Plugin.php b/src/BigCommerce/Plugin.php
@@ -4,7 +4,7 @@
 namespace BigCommerce;
 
 class Plugin {
-	const VERSION = '3.19.0';
+	const VERSION = '3.20.0';
 
 	protected static $_instance;
 
diff --git a/src/BigCommerce/Settings/Sections/Cart.php b/src/BigCommerce/Settings/Sections/Cart.php
@@ -138,11 +138,15 @@ public function render_embedded_checkout_field() {
 		$permitted = (bool) apply_filters( 'bigcommerce/checkout/can_embed', true );
 		$checkbox  = sprintf( '<input id="field-%s" type="checkbox" value="1" class="regular-text code" name="%s" %s %s />', esc_attr( self::OPTION_EMBEDDED_CHECKOUT ), esc_attr( self::OPTION_EMBEDDED_CHECKOUT ), checked( true, $value, false ), disabled( $permitted, false, false ) );
 		if ( $permitted ) {
-			$description = __( 'If enabled, the checkout form will be embedded on your checkout page. If disabled, customers will be redirected to bigcommerce.com for checkout. Your WordPress domain must have a valid SSL certificate and sitewide HTTPS must be enabled in BigCommerce store to support embedded checkout.', 'bigcommerce' );
+			$description = __( 'If enabled, the checkout form will be embedded on your checkout page. If disabled, customers will be redirected to bigcommerce.com for checkout. Your WordPress domain must have a valid SSL certificate and %ssitewide HTTPS must be enabled%s in BigCommerce store to support embedded checkout.', 'bigcommerce' );
 		} else {
-			$description = __( 'Embedded checkout is disabled. An SSL certificate is required for your WordPress domain as well as enabling sitewide HTTPS in BigCommerce store to support embedded checkout.', 'bigcommerce' );
+			$description = __( 'Embedded checkout is disabled. An SSL certificate is required for your WordPress domain as well as %senabling sitewide HTTPS%s in BigCommerce store to support embedded checkout.', 'bigcommerce' );
 		}
-		printf( '<p class="description">%s %s</p>', $checkbox, $description );
+		printf( '<p class="description">%s %s</p>', $checkbox, sprintf(
+			$description,
+			sprintf( '<a target="__blank" href="%s">', esc_url( 'https://login.bigcommerce.com/deep-links/manage/settings/store' ) ),
+			'</a>'
+		) );
 	}
 
 	public function render_cart_page_field() {
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc7f57417901b86d5ae5b1dda4976bf60::getLoader();
+return ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4::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 ComposerAutoloaderInitc7f57417901b86d5ae5b1dda4976bf60
+class ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc7f57417901b86d5ae5b1dda4976bf60', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc7f57417901b86d5ae5b1dda4976bf60', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit39b28582cfaf12bb36d8163a54330ec4', '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\ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::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\ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirec7f57417901b86d5ae5b1dda4976bf60($fileIdentifier, $file);
+            composerRequire39b28582cfaf12bb36d8163a54330ec4($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirec7f57417901b86d5ae5b1dda4976bf60($fileIdentifier, $file)
+function composerRequire39b28582cfaf12bb36d8163a54330ec4($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 ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60
+class ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4
 {
     public static $files = array (
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
@@ -1060,10 +1060,10 @@ class ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInitc7f57417901b86d5ae5b1dda4976bf60::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit39b28582cfaf12bb36d8163a54330ec4::$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', '4.12.05.15.2020');`
	`2`	`+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '4.30.06.05.2020');`