Google Pull work integration branch.

js/src/components/google-mc-account-card/merchant-center-account-info-card.js

@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { sprintf, __ } from '@wordpress/i18n';
-import { useState } from '@wordpress/element';
 import { getSetting } from '@woocommerce/settings'; // eslint-disable-line import/no-unresolved
 // The above is an unpublished package, delivered with WC, we use Dependency Extraction Webpack Plugin to import it.
 // See https://github.com/woocommerce/woocommerce-admin/issues/7781
@@ -11,94 +10,24 @@ import { getSetting } from '@woocommerce/settings'; // eslint-disable-line impor
  * Internal dependencies
  */
 import AccountCard, { APPEARANCE } from '~/components/account-card';
-import AppButton from '~/components/app-button';
 import ConnectedIconLabel from '~/components/connected-icon-label';
-import Section from '~/components/section';
 import { GOOGLE_WPCOM_APP_CONNECTED_STATUS } from '~/constants';
-import { API_NAMESPACE } from '~/data/constants';
-import useDispatchCoreNotices from '~/hooks/useDispatchCoreNotices';
-import useApiFetchCallback from '~/hooks/useApiFetchCallback';
-import { useAppDispatch } from '~/data';
 import EnableNewProductSyncButton from '~/components/enable-new-product-sync-button';
 import AppNotice from '~/components/app-notice';
-import DisconnectModal, {
-	API_DATA_FETCH_FEATURE,
-} from '~/pages/settings/disconnect-modal';
-import { getSettingsUrl } from '~/utils/urls';
-import { recordGlaEvent } from '~/utils/tracks';
 
 /**
  * @typedef {import('~/data/types.js').GoogleMCAccount} GoogleMCAccount
  */
 
-/**
- * Clicking on the button to disable the new product sync (API Pull).
- *
- * @event gla_disable_product_sync_click
- */
-
 /**
  * Renders a Google Merchant Center account card UI with connected account information.
  *
  * @param {Object} props React props.
  * @param {GoogleMCAccount} props.googleMCAccount A data payload object of Google Merchant Center account.
- *
- * @fires gla_disable_product_sync_click
  */
 const MerchantCenterAccountInfoCard = ( { googleMCAccount } ) => {
-	const { createNotice, removeNotice } = useDispatchCoreNotices();
-	const { invalidateResolution } = useAppDispatch();
-
-	const [
-		fetchDisableNotifications,
-		{ loading: loadingDisableNotifications },
-	] = useApiFetchCallback( {
-		path: `${ API_NAMESPACE }/rest-api/authorize`,
-		method: 'DELETE',
-	} );
-
-	/**
-	 * Temporary code for disabling the API PULL Beta Feature from the GMC Card
-	 */
-	const [ openedModal, setOpenedModal ] = useState( null );
-	const dismissModal = () => setOpenedModal( null );
-	const openDisableDataFetchModal = () =>
-		setOpenedModal( API_DATA_FETCH_FEATURE );
-
 	const domain = new URL( getSetting( 'homeUrl' ) ).host;
 
-	const disableNotifications = async () => {
-		recordGlaEvent( 'gla_disable_product_sync_click' );
-
-		const { notice } = await createNotice(
-			'info',
-			__(
-				'Disabling the new Product Sync feature, please wait…',
-				'google-listings-and-ads'
-			)
-		);
-
-		try {
-			await fetchDisableNotifications();
-			invalidateResolution( 'getGoogleMCAccount', [] );
-		} catch ( error ) {
-			createNotice(
-				'error',
-				__(
-					'Unable to disable new product sync. Please try again later.',
-					'google-listings-and-ads'
-				)
-			);
-		}
-
-		removeNotice( notice.id );
-	};
-
-	// Show the button if the status is "approved".
-	const showDisconnectNotificationsButton =
-		googleMCAccount.wpcom_rest_api_status ===
-		GOOGLE_WPCOM_APP_CONNECTED_STATUS.APPROVED;
-
 	// Show the error if the status is set but is not "approved".
 	const showErrorNotificationsNotice =
 		googleMCAccount.wpcom_rest_api_status &&
@@ -126,15 +55,6 @@ const MerchantCenterAccountInfoCard = ( { googleMCAccount } ) => {
 				)
 			}
 		>
-			{ showDisconnectNotificationsButton && (
-				<AppNotice status="success" isDismissible={ false }>
-					{ __(
-						'Google has been granted access to fetch your product data.',
-						'google-listings-and-ads'
-					) }
-				</AppNotice>
-			) }
-
 			{ showErrorNotificationsNotice && (
 				<AppNotice status="warning" isDismissible={ false }>
 					{ __(
@@ -143,32 +63,6 @@ const MerchantCenterAccountInfoCard = ( { googleMCAccount } ) => {
 					) }
 				</AppNotice>
 			) }
-
-			{ openedModal && (
-				<DisconnectModal
-					onRequestClose={ dismissModal }
-					onDisconnected={ () => {
-						window.location.href = getSettingsUrl();
-					} }
-					disconnectTarget={ openedModal }
-					disconnectAction={ disableNotifications }
-				/>
-			) }
-
-			{ showDisconnectNotificationsButton && (
-				<Section.Card.Footer>
-					<AppButton
-						isDestructive
-						isLink
-						disabled={ loadingDisableNotifications }
-						text={ __(
-							'Disable product data fetch',
-							'google-listings-and-ads'
-						) }
-						onClick={ openDisableDataFetchModal }
-					/>
-				</Section.Card.Footer>
-			) }
 		</AccountCard>
 	);
 };

js/src/pages/settings/disconnect-modal/confirm-modal.js

@@ -12,7 +12,7 @@ import AppModal from '~/components/app-modal';
 import AppButton from '~/components/app-button';
 import WarningIcon from '~/components/warning-icon';
 import { useAppDispatch } from '~/data';
-import { ALL_ACCOUNTS, ADS_ACCOUNT, API_DATA_FETCH_FEATURE } from './constants';
+import { ALL_ACCOUNTS, ADS_ACCOUNT } from './constants';
 
 const textDict = {
 	[ ALL_ACCOUNTS ]: {
@@ -66,24 +66,6 @@ const textDict = {
 			),
 		],
 	},
-	[ API_DATA_FETCH_FEATURE ]: {
-		title: __( 'Disable data fetching', 'google-listings-and-ads' ),
-		confirmButton: __( 'Disable data fetching', 'google-listings-and-ads' ),
-		confirmation: __(
-			'Yes, I want to disable the data fetching feature.',
-			'google-listings-and-ads'
-		),
-		contents: [
-			__(
-				'I understand that I am disabling the data fetching feature from this WooCommerce extension.',
-				'google-listings-and-ads'
-			),
-			__(
-				'Any ongoing campaigns and configuration will continue to run. They will be pushed to Google as in the previous versions of this extension.',
-				'google-listings-and-ads'
-			),
-		],
-	},
 };
 
 export default function ConfirmModal( {

js/src/pages/settings/disconnect-modal/constants.js

@@ -1,3 +1,2 @@
 export const ALL_ACCOUNTS = 'all-accounts';
 export const ADS_ACCOUNT = 'ads-account';
-export const API_DATA_FETCH_FEATURE = 'api-data-fetch-feature';

js/src/pages/settings/index.js

@@ -18,7 +18,6 @@ import LinkedAccounts from './linked-accounts';
 import ReconnectWPComAccount from './reconnect-wpcom-account';
 import ReconnectGoogleAccount from './reconnect-google-account';
 import EditStoreAddress from './edit-store-address';
-import EnableNewProductSyncNotice from '~/components/enable-new-product-sync-notice';
 import MainTabNav from '~/components/main-tab-nav';
 import RebrandingTour from '~/components/tours/rebranding-tour';
 import './index.scss';
@@ -62,7 +61,6 @@ const Settings = () => {
 
 	return (
 		<div className={ pageClassName }>
-			<EnableNewProductSyncNotice />
 			<MainTabNav />
 			<RebrandingTour />
 			<ContactInformationPreview />

src/API/Google/Settings.php

@@ -3,10 +3,12 @@
 
 namespace Automattic\WooCommerce\GoogleListingsAndAds\API\Google;
 
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\DB\Query\ShippingRateQuery;
 use Automattic\WooCommerce\GoogleListingsAndAds\DB\Query\ShippingTimeQuery;
 use Automattic\WooCommerce\GoogleListingsAndAds\Internal\ContainerAwareTrait;
 use Automattic\WooCommerce\GoogleListingsAndAds\Internal\Interfaces\ContainerAwareInterface;
+use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\MerchantCenterService;
 use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\TargetAudience;
 use Automattic\WooCommerce\GoogleListingsAndAds\Options\OptionsInterface;
 use Automattic\WooCommerce\GoogleListingsAndAds\Proxies\WC;
@@ -65,7 +67,9 @@
 	 * Sync the shipping settings with Google.
 	 */
 	public function sync_shipping() {
-		if ( ! $this->should_sync_shipping() ) {
+		/** @var MerchantCenterService $merchant_center */
+		$merchant_center = $this->container->get( MerchantCenterService::class );
+		if ( ! $this->should_sync_shipping() || ! $merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_SHIPPING ) ) {
 			return;
 		}
 

src/API/WP/NotificationsService.php

@@ -76,6 +76,13 @@ class NotificationsService implements Service, OptionsAwareInterface {
 	 */
 	private $notification_url;
 
+	/**
+	 * The WordPress.com blog ID
+	 *
+	 * @var int $blog_id
+	 */
+	private $blog_id;
+
 	/**
 	 * The Merchant center service
 	 *
@@ -97,10 +104,10 @@ class NotificationsService implements Service, OptionsAwareInterface {
 	 * @param AccountService        $account_service
 	 */
 	public function __construct( MerchantCenterService $merchant_center, AccountService $account_service ) {
-		$blog_id                = Jetpack_Options::get_option( 'id' );
+		$this->blog_id          = Jetpack_Options::get_option( 'id' );
 		$this->merchant_center  = $merchant_center;
 		$this->account_service  = $account_service;
-		$this->notification_url = "https://public-api.wordpress.com/wpcom/v2/sites/{$blog_id}/partners/google/notifications";
+		$this->notification_url = "https://public-api.wordpress.com/wpcom/v2/sites/{$this->blog_id}/partners/google/notifications";
 	}
 
 	/**
@@ -130,7 +137,6 @@ public function notify( string $topic, $item_id = null, $data = [] ): bool {
 				'message'                     => 'Notification was not sent because the Notification Service is not ready or the topic is not valid.',
 				'data_type'                   => $this->get_datatype_from_topic( $topic ),
 				'topic_is_valid'              => $this->yes_or_no( $is_valid_topic ),
-				'wpcom_authorized'            => $this->yes_or_no( $this->options->is_wpcom_api_authorized() ),
 				'wpcom_healthy'               => $this->yes_or_no( $this->account_service->is_wpcom_api_status_healthy() ),
 				'mc_sync_ready'               => $this->yes_or_no( $this->merchant_center->is_ready_for_syncing() ),
 				'notification_service_status' => $this->enabled_or_disabled( $this->is_enabled() ),
@@ -149,7 +155,13 @@ public function notify( string $topic, $item_id = null, $data = [] ): bool {
 				'x-woocommerce-topic' => $topic,
 				'Content-Type'        => 'application/json',
 			],
-			'body'    => array_merge( $data, [ 'item_id' => $item_id ] ),
+			'body'    => array_merge(
+				$data,
+				[
+					'item_id' => $item_id,
+					'blog_id' => $this->blog_id,
+				]
+			),
 			'url'     => $this->get_notification_url(),
 		];
 
@@ -206,14 +218,14 @@ public function get_notification_url(): string {
 
 	/**
 	 * If the Notifications are ready
-	 * This happens when the WPCOM API is Authorized and the feature is enabled.
+	 * This happens when the feature is enabled and Merchant Center is ready for syncing.
 	 *
 	 * @param string|null $data_type The data type to check.
 	 * @param bool        $with_health_check If true. Performs a remote request to WPCOM API to get the status.
 	 *        * @return bool
 	 */
 	public function is_ready( string $data_type = null, bool $with_health_check = true ): bool {
-		$is_ready = $this->options->is_wpcom_api_authorized() && $this->is_enabled() && $this->merchant_center->is_ready_for_syncing() && ( $with_health_check === false || $this->account_service->is_wpcom_api_status_healthy() );
+		$is_ready = $this->is_enabled() && $this->merchant_center->is_ready_for_syncing() && ( $with_health_check === false || $this->account_service->is_wpcom_api_status_healthy() );
 		return $is_ready && ( is_null( $data_type ) || $this->is_pull_enabled_for_datatype( $data_type ) );
 	}
 

src/ConnectionTest.php

@@ -136,6 +136,9 @@
 			$this->response .= 'Failed to connect to Google.';
 		}
 
+		$notification_service = new NotificationsService( $this->container->get( MerchantCenterService::class ), $this->container->get( AccountService::class ) );
+		$notification_service->set_options_object( $options );
+
 		?>
 		<div class="wrap">
 			<h2>Connection Test</h2>
@@ -572,7 +575,44 @@
 				<hr />
 
 				<h2 class="title">Product Sync</h2>
+				<table class="form-table" role="presentation">
+					<tr>
+						<th><label>Products MC PUSH:</label></th>
+						<td>
+							<p>
+
+								<code><?php echo $this->enabled_or_disabled( $notification_service->is_push_enabled_for_datatype( NotificationsService::DATATYPE_PRODUCT ) ); ?></code>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th><label>Coupons MC PUSH:</label></th>
+						<td>
+							<p>
+
+								<code><?php echo $this->enabled_or_disabled( $notification_service->is_push_enabled_for_datatype( NotificationsService::DATATYPE_COUPON ) ); ?></code>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th><label>Shipping MC PUSH:</label></th>
+						<td>
+							<p>
 
+								<code><?php echo $this->enabled_or_disabled( $notification_service->is_push_enabled_for_datatype( NotificationsService::DATATYPE_SHIPPING ) ); ?></code>
+							</p>
+						</td>
+					</tr>
+					<tr>
+						<th><label>Settings MC PUSH:</label></th>
+						<td>
+							<p>
+
+								<code><?php echo $this->enabled_or_disabled( $notification_service->is_push_enabled_for_datatype( NotificationsService::DATATYPE_SETTINGS ) ); ?></code>
+							</p>
+						</td>
+					</tr>
+				</table>
 				<form action="<?php echo esc_url( admin_url( 'admin.php' ) ); ?>" method="GET">
 					<table class="form-table" role="presentation">
 						<tr>
@@ -673,8 +713,6 @@
 				<?php
 				  $options = $this->container->get( OptionsInterface::class );
 				  $wp_api_status = $options->get( OptionsInterface::WPCOM_REST_API_STATUS );
-				  $notification_service = new NotificationsService( $this->container->get( MerchantCenterService::class ), $this->container->get( AccountService::class ) );
-				  $notification_service->set_options_object( $options );
 				?>
 				<h2 class="title">Partner API Pull Integration</h2>
 				<form action="<?php echo esc_url( admin_url( 'admin.php' ) ); ?>" method="GET">

src/Coupon/CouponSyncer.php

@@ -2,6 +2,7 @@
 declare(strict_types = 1);
 namespace Automattic\WooCommerce\GoogleListingsAndAds\Coupon;
 
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Google\DeleteCouponEntry;
 use Automattic\WooCommerce\GoogleListingsAndAds\Google\GooglePromotionService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Google\InvalidCouponEntry;
@@ -479,13 +480,28 @@
 		if ( ! $this->merchant_center->should_push() ) {
 			do_action(
 				'woocommerce_gla_error',
-				'Cannot push any coupons because they are being fetched automatically.',
+				'Cannot push any coupons because your store is not ready for syncing.',
 				__METHOD__
 			);
 
 			throw new CouponSyncerException(
 				__(
-					'Pushing Coupons will not run if the automatic data fetching is enabled. Please review your configuration in Google Listing and Ads settings.',
+					'Pushing coupons will not run if the store is not ready for syncing.',
+					'google-listings-and-ads'
+				)
+			);
+		}
+
+		if ( ! $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_COUPON ) ) {
+			do_action(
+				'woocommerce_gla_error',
+				'Cannot push any coupons because the syncing feature has been disabled on your store.',
+				__METHOD__
+			);
+
+			throw new CouponSyncerException(
+				__(
+					'Pushing Coupons will not run if the PUSH Sync functionality has been disabled.',
 					'google-listings-and-ads'
 				)
 			);