Merge pull request #202 from moderntribe/release/3.14.0

packaged version 3.14.0

Author: becomevocal

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [3.14.0]
+
+### Added
+- Added a missing entry to the 3.0.0 changelog regarding fixing the uninstaller.
+
+### Fixed
+- When the site url changes, the connected channel site URL is also updated.
+
+### Changed
+- Added a new notification in the Diagnostics panel to call out when template
+  overrides are being used.
+- Enhanced the template for product cards by adding additional classes related
+  to product statuses.
+    - bc-\[product-id\]
+    - bc-availability-*
+    - bc-product-sale
+    - bc-product-outofstock
+    - bc-product-lowinventory
+
 ## [3.13.0]
 
 ### Added
@@ -18,9 +37,6 @@
   upon completion of the order. This resolves an issue on smaller screens where
   the window would be stuck at the bottom of the page.
 
-### Fixed
-
-
 ## [3.12.0]
 
 ### Added

assets/css/bc-admin.css

@@ -23,6 +23,20 @@ export const bigCommerceDiagnostics = data => (
 	<h1 class="h1 bc-diagnostics-data--success">
 		<i class="bc-icon icon-bc-order_confirmation"></i> ${I18N.messages.diagnostics_success_message}
 	</h1>
+	
+	${Object.values(data).map(group => (
+		group.key === 'bigcommerce' ?
+			Object.values(group.value).map(values => (
+				values.key === 'templateoverrides' && values.value.length > 0 ?
+					`<div class="bc-diagnostics-data__notice">
+						<i class="dashicons-before dashicons-warning"></i> 
+						<span class="bc-diagnostics-data__notice--overrides">${I18N.messages.diagnostics_template_overrides_message}</span> 
+					</div>`
+				: ''
+			)).join('')
+		: ''
+	)).join('')}
+	
 	${Object.values(data).map(group => (
 		`<div class="bc-diagnostics-data__section bc-diagnostics-data__section-${group.key}">
 			<h2 class="h2 bc-diagnostics-data__section-header">${group.label}</h2>

assets/css/bc-admin.min.css

@@ -272,6 +272,31 @@
 	}
 }
 
+.bc-diagnostics-data__notice {
+	background-color: var(--color-off-white);
+	color: var(--color-bc-red);
+	font-size: 1.35em;
+	line-height: 1.55em;
+	padding: 12px;
+	margin-bottom: 25px;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+
+	i {
+		flex: 0 0 20px;
+		margin-right: 10px;
+
+		&:before {
+			line-height: 1.55em;
+		}
+	}
+
+	span {
+		flex: 1;
+	}
+}
+
 .bc-settings-section--nav_menu {
 
 	.bc-settings-section__nav-menu-item-label {

assets/js/dist/admin/scripts.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.13.0
+Version:      3.14.0
 Author URI:   https://www.bigcommerce.com/wordpress
 Requires PHP: 5.6.24
 Text Domain:  bigcommerce

assets/js/dist/admin/scripts.min.js

@@ -1,2 +1,2 @@
 <?php
-define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '6.24.01.31.2020');
+define('BIGCOMMERCE_ASSETS_BUILD_TIMESTAMP', '6.12.02.21.2020');

assets/js/src/admin/templates/diagnostics.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.13.0
+Stable tag: 3.14.0
 Requires PHP: 5.6.24
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

assets/pcss/admin/pages/settings/_plugin-settings.pcss

@@ -21,19 +21,20 @@ public function get_data() {
 				'oauth_popup_trigger' => __( 'Click here to authorize WordPress to connect to your BigCommerce account', 'bigcommerce' ),
 			],
 			'messages'   => [
-				'ajax_error'                        => __( 'There was an error submitting or retrieving your request. Please try again.', 'bigcommerce' ),
-				'no_results'                        => __( 'We could not find any products that matched your query. Please clear your search and try again.', 'bigcommerce' ),
-				'no_products'                       => __( 'We could not find any products that matched your query. Please edit this block and try again.', 'bigcommerce' ),
-				'excessive_attempts'                => __( 'We are still working on connecting your account. It should not be too much longer.', 'bigcommerce' ),
-				'account_connection_error'          => __( 'There was an error connecting your account:', 'bigcommerce' ),
-				'account_connection_code'           => __( 'Error Code:', 'bigcommerce' ),
-				'account_connection_message'        => __( 'Error Message:', 'bigcommerce' ),
-				'account_creation_message'          => __( "We're getting your account ready.", 'bigcommerce' ),
-				'channel_confirmation'              => __( "The %s channel will point to this site's URL and its route settings will be updated in BigCommerce.", 'bigcommerce' ),
-				'diagnostics_success_message'       => __( 'Data retrieved successfully', 'bigcommerce' ),
-				'diagnostics_request_error_header'  => __( 'Diagnostics Unavailable', 'bigcommerce' ),
-				'diagnostics_request_error_message' => __( 'There was an error trying to retrieve information about your site. Please try again.', 'bigcommerce' ),
-				'sync'                              => [
+				'ajax_error'                             => __( 'There was an error submitting or retrieving your request. Please try again.', 'bigcommerce' ),
+				'no_results'                             => __( 'We could not find any products that matched your query. Please clear your search and try again.', 'bigcommerce' ),
+				'no_products'                            => __( 'We could not find any products that matched your query. Please edit this block and try again.', 'bigcommerce' ),
+				'excessive_attempts'                     => __( 'We are still working on connecting your account. It should not be too much longer.', 'bigcommerce' ),
+				'account_connection_error'               => __( 'There was an error connecting your account:', 'bigcommerce' ),
+				'account_connection_code'                => __( 'Error Code:', 'bigcommerce' ),
+				'account_connection_message'             => __( 'Error Message:', 'bigcommerce' ),
+				'account_creation_message'               => __( "We're getting your account ready.", 'bigcommerce' ),
+				'channel_confirmation'                   => __( "The %s channel will point to this site's URL and its route settings will be updated in BigCommerce.", 'bigcommerce' ),
+				'diagnostics_success_message'            => __( 'Data retrieved successfully', 'bigcommerce' ),
+				'diagnostics_request_error_header'       => __( 'Diagnostics Unavailable', 'bigcommerce' ),
+				'diagnostics_request_error_message'      => __( 'There was an error trying to retrieve information about your site. Please try again.', 'bigcommerce' ),
+				'diagnostics_template_overrides_message' => __( 'If you are experiencing issues, it may be due to template overrides that rely on older versions of the plugin. Please review your overrides and remove any that may not be necessary.', 'bigcommerce' ),
+				'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' ),

bigcommerce.php

@@ -36,6 +36,7 @@
 use BigCommerce\Settings\Sections\Next_Steps;
 use BigCommerce\Settings\Sections\Reviews;
 use BigCommerce\Settings\Sections\Troubleshooting_Diagnostics;
+use BigCommerce\Settings\Site_Update;
 use BigCommerce\Settings\Start_Over;
 use BigCommerce\Taxonomies\Channel\Channel;
 use Pimple\Container;
@@ -74,7 +75,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_UPDATE         = 'settings.site_update';
 
 	const CONFIG_STATUS              = 'settings.configuration_status';
 	const CONFIG_DISPLAY_MENUS       = 'settings.configuration_display_menus';
@@ -103,6 +104,7 @@ public function register( Container $container ) {
 		$this->diagnostics( $container );
 		$this->set_menus_default_visibility( $container );
 		$this->resources( $container );
+		$this->site_update( $container );
 
 	}
 
@@ -651,4 +653,21 @@ private function resources( Container $container ) {
 			return $container[ self::RESOURCES_SCREEN ]->get_url();
 		} ), 10, 1 );
 	}
+
+	private function site_update( $container ) {
+		$container[ self::SITE_UPDATE ] = function () use ( $container ) {
+			return new Site_Update(
+				$container[ Api::FACTORY ]->sites(),
+				get_option( Channel::CHANNEL_ID )
+			);
+		};
+
+		add_filter( 'pre_update_option_siteurl', function( $option ) use ($container ) {
+			return $container[ self::SITE_UPDATE ]->update_bc_channel_site_url( $option );
+		});
+
+		add_filter( 'bigcommerce/settings/channel_site_url', $this->create_callback( 'channel_site_url', function ( $url ) use ( $container ) {
+			return $container[ self::SITE_UPDATE ]->get_bc_channel_site_url( $url );
+		} ), 10, 1 );
+	}
 }

build-timestamp.php

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

readme.txt

@@ -135,7 +135,7 @@ public function render_other_channels() {
 	}
 
 	/**
-	 * Retrive all Channel taxonomy terms with the
+	 * Retrieve all Channel taxonomy terms with the
 	 * given connection status.
 	 *
 	 * @param string $status

src/BigCommerce/Assets/Admin/JS_Localization.php

@@ -290,6 +290,11 @@ public function get_diagnostics_data() {
 						'key'   => 'templateoverrides',
 						'value' => $this->get_template_overrides(),
 					],
+					[
+						'label' => __( 'Stored Channel URL', 'bigcommerce' ),
+						'key'   => 'bcsiteurl',
+						'value' => $this->get_bc_url(),
+					]
 				],
 			],
 		];
@@ -303,6 +308,10 @@ public function get_diagnostics_data() {
 		wp_die( '', '', [ 'response' => null ] );
 	}
 
+	private function get_bc_url() {
+		return apply_filters( 'bigcommerce/settings/channel_site_url', null );
+	}
+
 
 	/**
 	 * @return array List of active plugins

src/BigCommerce/Container/Settings.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace BigCommerce\Settings;
+
+
+use BigCommerce\Api\v3\Api\SitesApi;
+use BigCommerce\Api\v3\ApiException;
+
+class Site_Update {
+
+	/**
+	 * @var SitesApi
+	 */
+	private $sites_api;
+	private $channel;
+
+	public function __construct( SitesApi $sites_api, $channel ) {
+		$this->sites_api = $sites_api;
+		$this->channel   = $channel;
+	}
+
+	/**
+	 * @param $option
+	 *
+	 * @return mixed
+	 *
+	 * @filter pre_update_option_siteurl
+	 */
+	public function update_bc_channel_site_url( $option ) {
+		if ( ! $this->channel ) {
+			return $option;
+		}
+
+		try {
+			$channel_site = $this->sites_api->getChannelSite( $this->channel );
+		} catch ( ApiException $exception ) {
+			return $option;
+		}
+
+		$site_data = $channel_site->getData();
+		$site_data->setUrl( $option );
+
+		try{
+			$this->sites_api->putChannelSite( $this->channel, $site_data );
+		} catch ( ApiException $exception ) {
+			return $option;
+		}
+
+		return $option;
+	}
+
+	/**
+	 * @param $url
+	 *
+	 * @return string
+	 *
+	 * @filter bigcommerce/settings/channel_site_url
+	 */
+	public function get_bc_channel_site_url( $url ) {
+		try {
+			$channel_site = $this->sites_api->getChannelSite( $this->channel );
+		} catch ( ApiException $exception ) {
+			return $url;
+		}
+
+		return $channel_site->getData()->getUrl();
+	}
+}

src/BigCommerce/Plugin.php

@@ -20,7 +20,6 @@ class Product_Card extends Controller {
 
 	protected $template           = 'components/products/product-card.php';
 	protected $wrapper_tag        = 'div';
-	protected $wrapper_classes    = [ 'bc-product-card' ];
 	protected $wrapper_attributes = [ 'data-js' => 'bc-product-loop-card' ];
 
 	protected function parse_options( array $options ) {
@@ -119,4 +118,18 @@ protected function get_form( Product $product ) {
 
 		return $component->render();
 	}
-}
+
+	protected function get_wrapper_classes() {
+		/** @var Product $product */
+		$product = $this->options[ self::PRODUCT ];
+
+		return [
+			'bc-product-card',
+			'bc-' . $product->bc_id(),
+			'bc-product-availability--' . $product->availability(),
+			$product->out_of_stock() ? 'bc-product-outofstock' : '',
+			$product->low_inventory() ? 'bc-product-lowinventory' : '',
+			$product->on_sale() ? 'bc-product-sale' : '',
+		];
+	}
+}

src/BigCommerce/Settings/Sections/Channels.php

@@ -18,7 +18,6 @@ class Related_Product extends Controller {
 
 	protected $template = 'components/products/related-product-card.php';
 	protected $wrapper_tag = 'div';
-	protected $wrapper_classes = [ 'bc-product-card', 'bc-product-card--related' ];
 	protected $wrapper_attributes = [ 'data-js' => 'bc-product-loop-card' ];
 
 	protected function parse_options( array $options ) {
@@ -99,4 +98,19 @@ protected function get_form( Product $product ) {
 
 		return $component->render();
 	}
-}
+
+	protected function get_wrapper_classes() {
+		/** @var Product $product */
+		$product = $this->options[ self::PRODUCT ];
+
+		return [
+			'bc-product-card',
+			'bc-product-card--related',
+			'bc-' . $product->bc_id(),
+			'bc-product-availability--' . $product->availability(),
+			$product->out_of_stock() ? 'bc-product-outofstock' : '',
+			$product->low_inventory() ? 'bc-product-lowinventory' : '',
+			$product->on_sale() ? 'bc-product-sale' : '',
+		];
+	}
+}

src/BigCommerce/Settings/Sections/Troubleshooting_Diagnostics.php

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

src/BigCommerce/Settings/Site_Update.php

@@ -589,6 +589,7 @@
     'BigCommerce\\Settings\\Sections\\Units' => $baseDir . '/src/BigCommerce/Settings/Sections/Units.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_Update' => $baseDir . '/src/BigCommerce/Settings/Site_Update.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',