Block Shipping, Products and Coupons when Sync Push is disabled

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/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>
@@ -559,7 +562,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>
@@ -660,8 +700,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 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'
 				)
 			);

src/Jobs/AbstractCouponSyncerJob.php

@@ -4,6 +4,7 @@
 namespace Automattic\WooCommerce\GoogleListingsAndAds\Jobs;
 
 use Automattic\WooCommerce\GoogleListingsAndAds\ActionScheduler\ActionSchedulerInterface;
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\MerchantCenterService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Coupon\CouponHelper;
 use Automattic\WooCommerce\GoogleListingsAndAds\Coupon\CouponSyncer;
@@ -72,6 +73,6 @@
 	 * @return bool Returns true if the job can be scheduled.
 	 */
 	public function can_schedule( $args = [] ): bool {
-		return ! $this->is_running( $args ) && $this->merchant_center->should_push();
+		return ! $this->is_running( $args ) && $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_COUPON );
 	}
 }

src/Jobs/AbstractProductSyncerBatchedJob.php

@@ -4,6 +4,7 @@
 namespace Automattic\WooCommerce\GoogleListingsAndAds\Jobs;
 
 use Automattic\WooCommerce\GoogleListingsAndAds\ActionScheduler\ActionSchedulerInterface;
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\MerchantCenterService;
 use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\MerchantStatuses;
 use Automattic\WooCommerce\GoogleListingsAndAds\Product\BatchProductHelper;
@@ -80,6 +81,6 @@ public function __construct(
 	 * @return bool Returns true if the job can be scheduled.
 	 */
 	public function can_schedule( $args = [] ): bool {
-		return ! $this->is_running( $args ) && $this->merchant_center->should_push();
+		return ! $this->is_running( $args ) && $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_PRODUCT );
 	}
 }

src/Jobs/AbstractProductSyncerJob.php

@@ -4,6 +4,7 @@
 namespace Automattic\WooCommerce\GoogleListingsAndAds\Jobs;
 
 use Automattic\WooCommerce\GoogleListingsAndAds\ActionScheduler\ActionSchedulerInterface;
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\MerchantCenterService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Product\ProductRepository;
 use Automattic\WooCommerce\GoogleListingsAndAds\Product\ProductSyncer;
@@ -62,6 +63,6 @@ public function __construct(
 	 * @return bool Returns true if the job can be scheduled.
 	 */
 	public function can_schedule( $args = [] ): bool {
-		return ! $this->is_running( $args ) && $this->merchant_center->should_push();
+		return ! $this->is_running( $args ) && $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_PRODUCT );
 	}
 }

src/Jobs/UpdateShippingSettings.php

@@ -5,6 +5,7 @@
 
 use Automattic\WooCommerce\GoogleListingsAndAds\ActionScheduler\ActionSchedulerInterface;
 use Automattic\WooCommerce\GoogleListingsAndAds\API\Google\Settings as GoogleSettings;
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\MerchantCenter\MerchantCenterService;
 
 defined( 'ABSPATH' ) || exit;
@@ -21,6 +22,7 @@
  * @since 2.1.0
  */
 class UpdateShippingSettings extends AbstractActionSchedulerJob {
+
 	/**
 	 * @var MerchantCenterService
 	 */
@@ -97,7 +99,7 @@ public function schedule( array $args = [] ) {
 	 * @return bool
 	 */
 	protected function can_sync_shipping(): bool {
-		// Confirm that the Merchant Center account is connected and the user has chosen for the shipping rates to be synced from WooCommerce settings.
-		return $this->merchant_center->is_connected() && $this->google_settings->should_get_shipping_rates_from_woocommerce();
+		// Confirm that the Merchant Center account is connected, the user has chosen for the shipping rates to be synced from WooCommerce settings and the Push Sync is enabled for Shipping.
+		return $this->merchant_center->is_connected() && $this->google_settings->should_get_shipping_rates_from_woocommerce() && $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_SHIPPING );
 	}
 }

src/MerchantCenter/MerchantCenterService.php

@@ -126,17 +126,28 @@ public function is_ready_for_syncing(): bool {
 	}
 
 	/**
-	 * Whether we should push data into MC. Only if:
-	 * - MC is ready for syncing {@see is_ready_for_syncing}
-	 * - Notifications Service is not enabled
+	 * Whether we should push data into MC. Only is MC is ready for syncing.
 	 *
+	 * @see is_ready_for_syncing
 	 * @return bool
 	 * @since 2.8.0
 	 */
 	public function should_push(): bool {
 		return $this->is_ready_for_syncing();
 	}
 
+	/**
+	 * Whether push is enabled for a specific data type.
+	 *
+	 * @param string $data_type The data type to check.
+	 * @return bool
+	 * @since x.x.x
+	 */
+	public function is_enabled_for_datatype( string $data_type ): bool {
+		/** @var NotificationsService $notifications_service */
+		$notifications_service = $this->container->get( NotificationsService::class );
+		return $notifications_service->is_push_enabled_for_datatype( $data_type );
+	}
 
 	/**
 	 * Get whether the country is supported by the Merchant Center.

src/Product/ProductSyncer.php

@@ -3,6 +3,7 @@
 
 namespace Automattic\WooCommerce\GoogleListingsAndAds\Product;
 
+use Automattic\WooCommerce\GoogleListingsAndAds\API\WP\NotificationsService;
 use Automattic\WooCommerce\GoogleListingsAndAds\Google\BatchInvalidProductEntry;
 use Automattic\WooCommerce\GoogleListingsAndAds\Google\BatchProductIDRequestEntry;
 use Automattic\WooCommerce\GoogleListingsAndAds\Google\BatchProductRequestEntry;
@@ -365,13 +366,28 @@
 		if ( ! $this->merchant_center->should_push() ) {
 			do_action(
 				'woocommerce_gla_error',
-				'Cannot push any products because they are being fetched automatically.',
+				'Cannot push any products because your store is not ready for syncing.',
 				__METHOD__
 			);
 
 			throw new ProductSyncerException(
 				__(
-					'Pushing products will not run if the automatic data fetching is enabled. Please review your configuration in Google Listing and Ads settings.',
+					'Pushing products will not run if the the store is not ready for syncing.',
+					'google-listings-and-ads'
+				)
+			);
+		}
+
+		if ( ! $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_PRODUCT ) ) {
+			do_action(
+				'woocommerce_gla_error',
+				'Cannot push any products because the syncing feature has been disabled on your store.',
+				__METHOD__
+			);
+
+			throw new ProductSyncerException(
+				__(
+					'Pushing products will not run if the PUSH Sync functionality has been disabled.',
 					'google-listings-and-ads'
 				)
 			);

src/Shipping/SyncerHooks.php

@@ -142,7 +142,9 @@ protected function handle_update_shipping_settings() {
 			$this->job_repository->get( ShippingNotificationJob::class )->schedule( [ 'topic' => NotificationsService::TOPIC_SHIPPING_UPDATED ] );
 		}
 
-		$this->job_repository->get( UpdateShippingSettings::class )->schedule();
+		if ( $this->merchant_center->is_enabled_for_datatype( NotificationsService::DATATYPE_SHIPPING ) ) {
+			$this->job_repository->get( UpdateShippingSettings::class )->schedule();
+		}
 
 		$this->already_scheduled = true;
 	}

tests/Unit/Coupon/CouponSyncerTest.php

@@ -154,6 +154,10 @@ public function test_update_throws_exception_when_mc_is_blocked() {
 			->willReturn( true );
 		$merchant_center->expects( $this->once() )
 			->method( 'should_push' )
+			->willReturn( true );
+		$merchant_center->expects( $this->once() )
+			->method( 'is_enabled_for_datatype' )
+			->with( 'coupons' )
 			->willReturn( false );
 		$this->coupon_syncer = $this->get_coupon_syncer( [ 'merchant_center' => $merchant_center ] );
 
@@ -170,6 +174,10 @@ public function test_delete_throws_exception_when_mc_is_blocked() {
 			->willReturn( true );
 		$merchant_center->expects( $this->once() )
 			->method( 'should_push' )
+			->willReturn( true );
+		$merchant_center->expects( $this->once() )
+			->method( 'is_enabled_for_datatype' )
+			->with( 'coupons' )
 			->willReturn( false );
 		$this->coupon_syncer = $this->get_coupon_syncer( [ 'merchant_center' => $merchant_center ] );
 
@@ -234,6 +242,10 @@ public function setUp(): void {
 		$this->merchant_center->expects( $this->any() )
 			->method( 'is_promotion_supported_country' )
 			->willReturn( true );
+		$this->merchant_center->expects( $this->any() )
+			->method( 'is_enabled_for_datatype' )
+			->with( 'coupons' )
+			->willReturn( true );
 
 		$this->target_audience = $this->createMock( TargetAudience::class );
 		$this->target_audience->expects( $this->any() )

tests/Unit/Jobs/UpdateAllProductsTest.php

@@ -130,6 +130,10 @@ public function test_single_empty_batch() {
 			->method( 'has_scheduled_action' )
 			->willReturn( false );
 
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( true );
+
 		/*
 		 * We expect only single call to `has_scheduled_action` when scheduling
 		 * the batch and no calls further since batch is empty.
@@ -165,6 +169,10 @@ public function test_single_partial_batch() {
 				[ self::PROCESS_ITEM_HOOK, [ $filtered_product_list->get_product_ids() ] ]
 			);
 
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( true );
+
 		$this->job->schedule();
 
 		do_action( self::CREATE_BATCH_HOOK, 1 );
@@ -197,6 +205,10 @@ public function test_multiple_full_batches() {
 			->method( 'has_scheduled_action' )
 			->willReturn( false );
 
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( true );
+
 		$this->job->schedule();
 
 		do_action( self::CREATE_BATCH_HOOK, 1 );
@@ -231,6 +243,10 @@ public function test_multiple_incomplete_batches() {
 			->method( 'has_scheduled_action' )
 			->willReturn( false );
 
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( true );
+
 		$this->job->schedule();
 
 		do_action( self::CREATE_BATCH_HOOK, 1 );
@@ -265,6 +281,10 @@ public function test_multiple_semi_empty_batches() {
 			->withConsecutive( [ [], 2, 0 ], [ [], 2, 2 ], [ [], 2, 4 ] )
 			->willReturnOnConsecutiveCalls( $batch_a, $batch_b, $batch_c );
 
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( true );
+
 		$this->job->schedule();
 
 		do_action( self::CREATE_BATCH_HOOK, 1 );
@@ -335,6 +355,18 @@ public function test_delayed_schedule() {
 			->method( 'schedule_single' )
 			->with( gmdate( 'U' ) + 100, self::CREATE_BATCH_HOOK, [ 1 ] );
 
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( true );
+
 		$this->job->schedule_delayed( 100 );
 	}
+
+	public function test_cannot_schedule_when_mc_push_is_blocked() {
+		$this->merchant_center
+			->method( 'is_enabled_for_datatype' )
+			->willReturn( false );
+
+		$this->assertFalse( $this->job->can_schedule() );
+	}
 }