Merge pull request #419 from moderntribe/release/5.0.2

packaged version 5.0.2

Author: chanceaclark

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [5.0.2]
+
+### Added
+- Add ability to use original image proportion on product single page. Go to Apperance → Bigcommerce → Product Single and change image size to original.
+
+### Changed
+- Show variant SKU if product SKU is not added or missing
+
+### Fixed
+- Prevent import fail on Analytics Settings retrieval due to outdated API use
+- Fix search issue with product widget block while using fast(headless) import. Allow searching by SKU, name 
+
 ## [5.0.1]
 
 ### Fixed
@@ -1877,6 +1889,7 @@
   in fact, reset postdata, so far as Gutenberg 3.2.0 is concerned.
 
 
+[5.0.2]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/5.0.1...5.0.2
 [5.0.1]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/4.37.0...5.0.0
 [4.37.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/4.36.0...4.37.0

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:      5.0.1
+Version:      5.0.2
 Author URI:   https://www.bigcommerce.com/wordpress
 Requires PHP: 7.4.0
 Text Domain:  bigcommerce

build-timestamp.php

@@ -1,2 +1,2 @@
 <?php
-define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '4.11.02.16.2023');
+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '3.41.03.24.2023');

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: 6.0.3
-Stable tag: 5.0.1
+Stable tag: 5.0.2
 Requires PHP: 7.4.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

src/BigCommerce/Api/Store_Api.php

@@ -101,10 +101,14 @@ private function update_server_time() {
 	public function get_analytics_settings() {
 		try {
 			$settings = $this->getCollection( '/settings/analytics' );
+
+			if ( empty( $settings ) ) {
+				return [];
+			}
 			$settings = array_map( function ( Resource $resource ) {
 				return get_object_vars( $resource->getUpdateFields() );
 			}, $settings );
-		} catch ( \Exception $e ) {
+		} catch ( \Throwable $e ) {
 			$settings = [];
 		}
 

src/BigCommerce/Container/Import.php

@@ -234,7 +234,7 @@ private function process( Container $container ) {
 		};
 
 		$container[ self::STORE ] = function ( Container $container ) {
-			return new Processors\Store_Settings( $container[ Api::FACTORY ]->store(), $container[ self::CUSTOMER_DEFAULT_GROUP ], $container[ self::MSF_STOREFRONT_PROCESSOR ] );
+			return new Processors\Store_Settings( $container[ Api::FACTORY ]->store(), $container[ self::CUSTOMER_DEFAULT_GROUP ], $container[ self::MSF_STOREFRONT_PROCESSOR ], $container[ Api::FACTORY ]->storefront_settings() );
 		};
 
 		$container[ self::CURRENCIES ] = function ( Container $container ) {

src/BigCommerce/Container/Settings.php

@@ -440,7 +440,7 @@ private function accounts( Container $container ) {
 
 	private function analytics( Container $container ) {
 		$container[ self::ANALYTICS_SECTION ] = function ( Container $container ) {
-			return new Analytics_Settings( $container[ Api::FACTORY ]->store() );
+			return new Analytics_Settings( $container[ Api::FACTORY ]->store(), $container[ Api::FACTORY ]->storefront_settings() );
 		};
 
 		add_action( 'bigcommerce/settings/register/screen=' . Settings_Screen::NAME, $this->create_callback( 'analytics_settings_register', function () use ( $container ) {

src/BigCommerce/Customizer/Sections/Product_Single.php

@@ -21,6 +21,7 @@ class Product_Single {
 	const ENABLE_PRICE_NONCE  = 'bigcommerce_enable_price_nonce';
 	const SIZE_DEFAULT        = 'default';
 	const SIZE_LARGE          = 'large';
+	const SIZE_ORIGINAL       = 'original';
 	const SIZE_CDN_STD        = 'standard';
 	const SIZE_CDN_THUMB      = 'thumbnail';
 
@@ -95,8 +96,9 @@ private function gallery_size( \WP_Customize_Manager $wp_customize ) {
 			'type'        => 'radio',
 			'label'       => __( 'Image Gallery Size', 'bigcommerce' ),
 			'choices'     => [
-				self::SIZE_DEFAULT => __( 'Default', 'bigcommerce' ),
-				self::SIZE_LARGE   => __( 'Large', 'bigcommerce' ),
+				self::SIZE_DEFAULT  => __( 'Default', 'bigcommerce' ),
+				self::SIZE_LARGE    => __( 'Large', 'bigcommerce' ),
+				self::SIZE_ORIGINAL => __( 'Original', 'bigcommerce' ),
 			],
 		] );
 	}

src/BigCommerce/Editor/Editor_Dialog_Template.php

@@ -5,6 +5,7 @@
 
 use BigCommerce\Customizer\Sections\Product_Archive;
 use BigCommerce\Exceptions\Channel_Not_Found_Exception;
+use BigCommerce\Import\Import_Type;
 use BigCommerce\Rest\Products_Controller;
 use BigCommerce\Rest\Shortcode_Controller;
 use BigCommerce\Taxonomies\Brand\Brand;
@@ -104,7 +105,7 @@ private function query_builder() {
 
 		return $this->render_template( 'query-builder.php', [
 			'featured'   => $featured,
-			'sale'       => $sale,
+			'sale'       => Import_Type::is_traditional_import() && $sale,
 			'brands'     => $brand_choices,
 			'categories' => $category_choices,
 			'channels'   => $channels,

src/BigCommerce/Import/Processors/Store_Settings.php

@@ -6,11 +6,14 @@
 
 use Bigcommerce\Api\Client;
 use BigCommerce\Api\Store_Api;
+use BigCommerce\Api\v3\Api\SettingsApi;
 use BigCommerce\Api\v3\ApiException;
 use BigCommerce\Import\Runner\Status;
 use BigCommerce\Logging\Error_Log;
 use BigCommerce\Post_Types\Product\Product;
 use BigCommerce\Settings;
+use BigCommerce\Taxonomies\Channel\Channel;
+use BigCommerce\Taxonomies\Channel\Connections;
 
 class Store_Settings implements Import_Processor {
 
@@ -39,8 +42,14 @@ class Store_Settings implements Import_Processor {
 	 */
 	private $storefront_processor;
 
-	public function __construct( Store_Api $store_api, Default_Customer_Group $default_customer_group, Storefront_Processor $storefront_processor ) {
+	/**
+	 * @var \BigCommerce\Api\v3\Api\SettingsApi
+	 */
+	private $api_v3;
+
+	public function __construct( Store_Api $store_api, Default_Customer_Group $default_customer_group, Storefront_Processor $storefront_processor, SettingsApi $api ) {
 		$this->store_api              = $store_api;
+		$this->api_v3                 = $api;
 		$this->default_customer_group = $default_customer_group;
 		$this->storefront_processor   = $storefront_processor;
 	}
@@ -75,9 +84,16 @@ public function run() {
 			];
 
 			if ( get_option( Settings\Sections\Analytics::SYNC_ANALYTICS, 1 ) ) {
-				$analytics                                                 = $this->store_api->get_analytics_settings();
-				$settings[ Settings\Sections\Analytics::FACEBOOK_PIXEL ]   = $this->extract_facebook_pixel_id( $analytics );
-				$settings[ Settings\Sections\Analytics::GOOGLE_ANALYTICS ] = $this->extract_google_analytics_id( $analytics );
+				$connections  = new Connections();
+				$channel      = $connections->current();
+				$analytics    = $this->api_v3->getStoreAnalyticsSettings( (int) get_term_meta( $channel->term_id, Channel::CHANNEL_ID, true ));
+
+				if ( ! empty( $analytics->data ) ) {
+					$analytics                                                  = json_decode( json_encode( $analytics->data ), true );
+					$settings[ Settings\Sections\Analytics::FACEBOOK_PIXEL ]   = $this->extract_facebook_pixel_id( $analytics );
+					$settings[ Settings\Sections\Analytics::GOOGLE_ANALYTICS ] = $this->extract_google_analytics_id( $analytics );
+				}
+
 			}
 
 			do_action( 'bigcommerce/log', Error_Log::DEBUG, __( 'Retrieved store settings', 'bigcommerce' ), [

src/BigCommerce/Import/Task_Manager.php

@@ -100,6 +100,7 @@ public function run_next( $state ) {
 		} catch ( No_Task_Found_Exception $e ) {
 			do_action( 'bigcommerce/log', Error_Log::NOTICE, __( 'No handler found for current import state', 'bigcommerce' ), [
 				'state'     => $state,
+				'import'    => Import_Type::is_traditional_import() ? 'full' : 'headless',
 			] );
 			do_action( 'bigcommerce/log', Error_Log::DEBUG, $e->getTraceAsString(), [] );
 

src/BigCommerce/Plugin.php

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