Resolve conflicts

becomevocal · becomevocal · commit 04054f3df06f · 2019-10-09T00:38:34.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.8.1]
+
+### Changed
+
+- Updated embedded checkout SDK to version 1.37.1 to better handle failures from the cart handover.
+
 ## [3.8.0]
 
 ### Added
@@ -66,7 +72,7 @@
   from this plugin, add the following snipped to a theme or plugin:
   ```
   add_action( 'plugins_loaded', function() {
-  	remove_action( 'wp_head', bigcommerce()->post_types->product_page_meta_description, 0 );
+    remove_action( 'wp_head', bigcommerce()->post_types->product_page_meta_description, 0 );
   }, 100, 0 );
   ```
 - Added support for custom image alt text. The alt text set in the BigCommerce admin will
@@ -942,6 +948,7 @@
 
 
 [Unreleased]: https://github.com/moderntribe/bigcommerce/compare/master...develop
+[3.8.1]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.8.0...3.8.1
 [3.8.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.7.0...3.8.0
 [3.7.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.6.0...3.7.0
 [3.6.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/3.5.0...3.6.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/dist/vendor.js b/assets/js/dist/vendor.js
diff --git a/assets/js/dist/vendor.min.js b/assets/js/dist/vendor.min.js
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.8.0
+Version:      3.8.1
 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', '5.31.10.01.2019');
+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '12.40.10.09.2019');
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.2.2
-Stable tag: 3.8.0
+Stable tag: 3.8.1
 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/Plugin.php b/src/BigCommerce/Plugin.php
@@ -4,7 +4,7 @@
 namespace BigCommerce;
 
 class Plugin {
-	const VERSION = '3.8.0';
+	const VERSION = '3.8.1';
 
 	protected static $_instance;
 
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit8c41424f3a8d09f7a91bc7e43542a9a7::getLoader();
+return ComposerAutoloaderInitfe71eae5c568f78e8137e0a51852fc18::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 ComposerAutoloaderInit8c41424f3a8d09f7a91bc7e43542a9a7
+class ComposerAutoloaderInitfe71eae5c568f78e8137e0a51852fc18
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit8c41424f3a8d09f7a91bc7e43542a9a7', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitfe71eae5c568f78e8137e0a51852fc18', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit8c41424f3a8d09f7a91bc7e43542a9a7', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitfe71eae5c568f78e8137e0a51852fc18', '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\ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18::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\ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire8c41424f3a8d09f7a91bc7e43542a9a7($fileIdentifier, $file);
+            composerRequirefe71eae5c568f78e8137e0a51852fc18($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire8c41424f3a8d09f7a91bc7e43542a9a7($fileIdentifier, $file)
+function composerRequirefe71eae5c568f78e8137e0a51852fc18($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 ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7
+class ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18
 {
     public static $files = array (
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
@@ -1042,10 +1042,10 @@ class ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit8c41424f3a8d09f7a91bc7e43542a9a7::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitfe71eae5c568f78e8137e0a51852fc18::$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', '5.31.10.01.2019');`
	`2`	`+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '12.40.10.09.2019');`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`require_once __DIR__ . '/composer/autoload_real.php';`
`6`	`6`
`7`		`-return ComposerAutoloaderInit8c41424f3a8d09f7a91bc7e43542a9a7::getLoader();`
	`7`	`+return ComposerAutoloaderInitfe71eae5c568f78e8137e0a51852fc18::getLoader();`